summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorguntasgrewal <guntasgrewal@gmail.com>2014-03-25 17:47:32 -0400
committerguntasgrewal <guntasgrewal@gmail.com>2014-03-25 17:47:32 -0400
commit433fc302fe2943e89a36657affea39d578475d20 (patch)
treeac22866f93f9353ab9c82978d2eac2fbe0927a4c /test
parent4e754e04d6bd04267e5a55011aa9f4f2a2fc7859 (diff)
Match Status added
Diffstat (limited to 'test')
-rw-r--r--test/controllers/matches_controller_test.rb4
-rw-r--r--test/fixtures/matches.yml2
2 files changed, 4 insertions, 2 deletions
diff --git a/test/controllers/matches_controller_test.rb b/test/controllers/matches_controller_test.rb
index 51b7f37..c3cc7a4 100644
--- a/test/controllers/matches_controller_test.rb
+++ b/test/controllers/matches_controller_test.rb
@@ -18,7 +18,7 @@ class MatchesControllerTest < ActionController::TestCase
test "should create match" do
assert_difference('Match.count') do
- post :create, match: { name: @match.name, tournament_id: @match.tournament_id, winner_id: @match.winner_id }
+ post :create, match: { name: @match.name, status: @match.status, tournament_id: @match.tournament_id, winner_id: @match.winner_id }
end
assert_redirected_to match_path(assigns(:match))
@@ -35,7 +35,7 @@ class MatchesControllerTest < ActionController::TestCase
end
test "should update match" do
- patch :update, id: @match, match: { name: @match.name, tournament_id: @match.tournament_id, winner_id: @match.winner_id }
+ patch :update, id: @match, match: { name: @match.name, status: @match.status, tournament_id: @match.tournament_id, winner_id: @match.winner_id }
assert_redirected_to match_path(assigns(:match))
end
diff --git a/test/fixtures/matches.yml b/test/fixtures/matches.yml
index 956229c..00af9f5 100644
--- a/test/fixtures/matches.yml
+++ b/test/fixtures/matches.yml
@@ -1,11 +1,13 @@
# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
one:
+ status: 1
tournament_id:
name: MyString
winner_id:
two:
+ status: 1
tournament_id:
name: MyString
winner_id: