diff --git a/spec/features/admin/legislation/proposals_spec.rb b/spec/features/admin/legislation/proposals_spec.rb index efd754b8a..9684c69ee 100644 --- a/spec/features/admin/legislation/proposals_spec.rb +++ b/spec/features/admin/legislation/proposals_spec.rb @@ -31,12 +31,12 @@ feature 'Admin legislation processes' do end scenario 'Sorting legislation proposals by title', js: true do - legislation_process = create(:legislation_process) - create(:legislation_proposal, title: 'bbbb', cached_votes_up: 10, legislation_process_id: legislation_process.id) - create(:legislation_proposal, title: 'aaaa', cached_votes_up: 20, legislation_process_id: legislation_process.id) - create(:legislation_proposal, title: 'cccc', cached_votes_up: 30, legislation_process_id: legislation_process.id) - visit admin_legislation_process_proposals_path(legislation_process.id) + process = create(:legislation_process) + create(:legislation_proposal, title: 'bbbb', legislation_process_id: process.id) + create(:legislation_proposal, title: 'aaaa', legislation_process_id: process.id) + create(:legislation_proposal, title: 'cccc', legislation_process_id: process.id) + visit admin_legislation_process_proposals_path(process.id) select "Title", from: "order-selector-participation" within('#proposals_table') do @@ -53,12 +53,12 @@ feature 'Admin legislation processes' do end scenario 'Sorting legislation proposals by supports', js: true do - legislation_process = create(:legislation_process) - create(:legislation_proposal, title: 'bbbb', cached_votes_up: 10, legislation_process_id: legislation_process.id) - create(:legislation_proposal, title: 'aaaa', cached_votes_up: 20, legislation_process_id: legislation_process.id) - create(:legislation_proposal, title: 'cccc', cached_votes_up: 30, legislation_process_id: legislation_process.id) - visit admin_legislation_process_proposals_path(legislation_process.id) + process = create(:legislation_process) + create(:legislation_proposal, cached_votes_up: 10, legislation_process_id: process.id) + create(:legislation_proposal, cached_votes_up: 30, legislation_process_id: process.id) + create(:legislation_proposal, cached_votes_up: 20, legislation_process_id: process.id) + visit admin_legislation_process_proposals_path(process.id) select "Supports", from: "order-selector-participation" within('#proposals_table') do @@ -69,12 +69,12 @@ feature 'Admin legislation processes' do end scenario 'Sorting legislation proposals by Id', js: true do - legislation_process = create(:legislation_process) - proposal1 = create(:legislation_proposal, title: 'bbbb', cached_votes_up: 10, legislation_process_id: legislation_process.id) - proposal2 = create(:legislation_proposal, title: 'aaaa', cached_votes_up: 20, legislation_process_id: legislation_process.id) - proposal3 = create(:legislation_proposal, title: 'cccc', cached_votes_up: 30, legislation_process_id: legislation_process.id) - visit admin_legislation_process_proposals_path(legislation_process.id, order: :title) + process = create(:legislation_process) + proposal1 = create(:legislation_proposal, title: 'bbbb', legislation_process_id: process.id) + proposal2 = create(:legislation_proposal, title: 'aaaa', legislation_process_id: process.id) + proposal3 = create(:legislation_proposal, title: 'cccc', legislation_process_id: process.id) + visit admin_legislation_process_proposals_path(process.id, order: :title) select "Id", from: "order-selector-participation" within('#proposals_table') do diff --git a/spec/features/legislation/proposals_spec.rb b/spec/features/legislation/proposals_spec.rb index d624bdd74..b4800528f 100644 --- a/spec/features/legislation/proposals_spec.rb +++ b/spec/features/legislation/proposals_spec.rb @@ -65,25 +65,23 @@ feature 'Legislation Proposals' do end scenario 'Selected filter apperars only if exists any selected poposal' do - legislation_process = create(:legislation_process) - create(:legislation_proposal, legislation_process_id: legislation_process.id) + create(:legislation_proposal, legislation_process_id: process.id) - visit legislation_process_proposals_path(legislation_process.id) + visit legislation_process_proposals_path(process) expect(page).not_to have_content('Selected') - create(:legislation_proposal, legislation_process_id: legislation_process.id, selected: true) + create(:legislation_proposal, legislation_process_id: process.id, selected: true) - visit legislation_process_proposals_path(legislation_process.id) + visit legislation_process_proposals_path(process) expect(page).to have_content('Selected') end scenario 'Selected filter works correctly' do - legislation_process = create(:legislation_process) - proposal1 = create(:legislation_proposal, legislation_process_id: legislation_process.id) - proposal2 = create(:legislation_proposal, legislation_process_id: legislation_process.id, selected: true) - visit legislation_process_proposals_path(legislation_process.id) + proposal1 = create(:legislation_proposal, legislation_process_id: process.id) + proposal2 = create(:legislation_proposal, legislation_process_id: process.id, selected: true) + visit legislation_process_proposals_path(process) click_link 'Selected'