summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorDavisLWebb <davislwebb@ymail.com>2014-02-20 17:13:51 -0500
committerDavisLWebb <davislwebb@ymail.com>2014-02-20 17:13:51 -0500
commitcd1fabe40ca4d290df33a2590f3a1f2072103972 (patch)
tree98afd236e1d14e892602304e739fc65d450a43fd /test
parentc14d0327a631a4321464c7c1e250d75458e13f49 (diff)
fix datatype names in generate.sh
Diffstat (limited to 'test')
-rw-r--r--test/controllers/alerts_controller_test.rb4
-rw-r--r--test/controllers/matches_controller_test.rb4
-rw-r--r--test/controllers/pms_controller_test.rb4
-rw-r--r--test/fixtures/alerts.yml4
-rw-r--r--test/fixtures/matches.yml4
-rw-r--r--test/fixtures/pms.yml8
-rw-r--r--test/fixtures/team_match_pairs.yml8
-rw-r--r--test/fixtures/user_team_pairs.yml8
-rw-r--r--test/fixtures/users.yml8
9 files changed, 26 insertions, 26 deletions
diff --git a/test/controllers/alerts_controller_test.rb b/test/controllers/alerts_controller_test.rb
index 29e58e9..4a5d911 100644
--- a/test/controllers/alerts_controller_test.rb
+++ b/test/controllers/alerts_controller_test.rb
@@ -18,7 +18,7 @@ class AlertsControllerTest < ActionController::TestCase
test "should create alert" do
assert_difference('Alert.count') do
- post :create, alert: { author: @alert.author, message: @alert.message }
+ post :create, alert: { author_id: @alert.author_id, message: @alert.message }
end
assert_redirected_to alert_path(assigns(:alert))
@@ -35,7 +35,7 @@ class AlertsControllerTest < ActionController::TestCase
end
test "should update alert" do
- patch :update, id: @alert, alert: { author: @alert.author, message: @alert.message }
+ patch :update, id: @alert, alert: { author_id: @alert.author_id, message: @alert.message }
assert_redirected_to alert_path(assigns(:alert))
end
diff --git a/test/controllers/matches_controller_test.rb b/test/controllers/matches_controller_test.rb
index 629622b..75c9dcf 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: { tournament: @match.tournament }
+ post :create, match: { tournament_id: @match.tournament_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: { tournament: @match.tournament }
+ patch :update, id: @match, match: { tournament_id: @match.tournament_id }
assert_redirected_to match_path(assigns(:match))
end
diff --git a/test/controllers/pms_controller_test.rb b/test/controllers/pms_controller_test.rb
index ccbe7b1..18b2449 100644
--- a/test/controllers/pms_controller_test.rb
+++ b/test/controllers/pms_controller_test.rb
@@ -18,7 +18,7 @@ class PmsControllerTest < ActionController::TestCase
test "should create pm" do
assert_difference('Pm.count') do
- post :create, pm: { author: @pm.author, message: @pm.message, recipient: @pm.recipient }
+ post :create, pm: { author_id: @pm.author_id, message: @pm.message, recipient_id: @pm.recipient_id }
end
assert_redirected_to pm_path(assigns(:pm))
@@ -35,7 +35,7 @@ class PmsControllerTest < ActionController::TestCase
end
test "should update pm" do
- patch :update, id: @pm, pm: { author: @pm.author, message: @pm.message, recipient: @pm.recipient }
+ patch :update, id: @pm, pm: { author_id: @pm.author_id, message: @pm.message, recipient_id: @pm.recipient_id }
assert_redirected_to pm_path(assigns(:pm))
end
diff --git a/test/fixtures/alerts.yml b/test/fixtures/alerts.yml
index 92ee1b0..52959af 100644
--- a/test/fixtures/alerts.yml
+++ b/test/fixtures/alerts.yml
@@ -1,9 +1,9 @@
# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
one:
- author:
+ author_id:
message: MyText
two:
- author:
+ author_id:
message: MyText
diff --git a/test/fixtures/matches.yml b/test/fixtures/matches.yml
index 48c08a5..0356cee 100644
--- a/test/fixtures/matches.yml
+++ b/test/fixtures/matches.yml
@@ -1,7 +1,7 @@
# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
one:
- tournament:
+ tournament_id:
two:
- tournament:
+ tournament_id:
diff --git a/test/fixtures/pms.yml b/test/fixtures/pms.yml
index 4ad9af3..f77e727 100644
--- a/test/fixtures/pms.yml
+++ b/test/fixtures/pms.yml
@@ -1,11 +1,11 @@
# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
one:
- author:
- recipient:
+ author_id:
+ recipient_id:
message: MyText
two:
- author:
- recipient:
+ author_id:
+ recipient_id:
message: MyText
diff --git a/test/fixtures/team_match_pairs.yml b/test/fixtures/team_match_pairs.yml
index 1a81ab4..5f9cf2f 100644
--- a/test/fixtures/team_match_pairs.yml
+++ b/test/fixtures/team_match_pairs.yml
@@ -1,9 +1,9 @@
# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
one:
- team:
- match:
+ team_id:
+ match_id:
two:
- team:
- match:
+ team_id:
+ match_id:
diff --git a/test/fixtures/user_team_pairs.yml b/test/fixtures/user_team_pairs.yml
index bda8bd3..a76036f 100644
--- a/test/fixtures/user_team_pairs.yml
+++ b/test/fixtures/user_team_pairs.yml
@@ -1,9 +1,9 @@
# Read about fixtures at http://api.rubyonrails.org/classes/ActiveRecord/FixtureSet.html
one:
- user:
- team:
+ user_id:
+ team_id:
two:
- user:
- team:
+ user_id:
+ team_id:
diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
index 02ffdbb..9f593bc 100644
--- a/test/fixtures/users.yml
+++ b/test/fixtures/users.yml
@@ -2,10 +2,10 @@
one:
name: MyText
- pw_hash:
- groups:
+ pw_hash: MyText
+ groups: 1
two:
name: MyText
- pw_hash:
- groups:
+ pw_hash: MyText
+ groups: 1