Commit 4bbe7aa07159cb1422299b7d0fad142ecdc9ffcc
1 parent
c1a7c9dc
Exists in
master
and in
11 other branches
proposals_discussion: fix tests
Showing
1 changed file
with
4 additions
and
4 deletions
Show diff stats
test/functional/proposals_discussion_plugin_public_controller_test.rb
@@ -12,18 +12,18 @@ class ProposalsDiscussionPluginPublicControllerTest < ActionController::TestCase | @@ -12,18 +12,18 @@ class ProposalsDiscussionPluginPublicControllerTest < ActionController::TestCase | ||
12 | 12 | ||
13 | should 'load proposals' do | 13 | should 'load proposals' do |
14 | proposals = 3.times.map { fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'proposal title', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id)} | 14 | proposals = 3.times.map { fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'proposal title', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id)} |
15 | - get :load_proposals, :profile => profile.identifier, :holder_id => discussion.id | 15 | + get :load_proposals, :profile => profile.identifier, :holder_id => topic.id |
16 | assert_equivalent proposals, assigns(:proposals) | 16 | assert_equivalent proposals, assigns(:proposals) |
17 | end | 17 | end |
18 | 18 | ||
19 | should 'add link to next page' do | 19 | should 'add link to next page' do |
20 | proposal = fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'proposal title', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id) | 20 | proposal = fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'proposal title', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id) |
21 | - get :load_proposals, :profile => profile.identifier, :holder_id => discussion.id | 21 | + get :load_proposals, :profile => profile.identifier, :holder_id => topic.id |
22 | assert_match /href=.*page=2/, response.body | 22 | assert_match /href=.*page=2/, response.body |
23 | end | 23 | end |
24 | 24 | ||
25 | should 'render blank text if it is the last page' do | 25 | should 'render blank text if it is the last page' do |
26 | - get :load_proposals, :profile => profile.identifier, :holder_id => discussion.id | 26 | + get :load_proposals, :profile => profile.identifier, :holder_id => topic.id |
27 | assert_equal '', response.body | 27 | assert_equal '', response.body |
28 | end | 28 | end |
29 | 29 | ||
@@ -31,7 +31,7 @@ class ProposalsDiscussionPluginPublicControllerTest < ActionController::TestCase | @@ -31,7 +31,7 @@ class ProposalsDiscussionPluginPublicControllerTest < ActionController::TestCase | ||
31 | proposal1 = fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'z proposal', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id) | 31 | proposal1 = fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'z proposal', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id) |
32 | proposal2 = fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'abc proposal', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id) | 32 | proposal2 = fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'abc proposal', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id) |
33 | proposal3 = fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'abd proposal', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id) | 33 | proposal3 = fast_create(ProposalsDiscussionPlugin::Proposal, :name => 'abd proposal', :abstract => 'proposal abstract', :profile_id => profile.id, :parent_id => topic.id) |
34 | - get :load_proposals, :profile => profile.identifier, :holder_id => discussion.id, :order => 'alphabetical' | 34 | + get :load_proposals, :profile => profile.identifier, :holder_id => topic.id, :order => 'alphabetical' |
35 | assert_equal [proposal2, proposal3, proposal1], assigns(:proposals) | 35 | assert_equal [proposal2, proposal3, proposal1], assigns(:proposals) |
36 | end | 36 | end |
37 | 37 |