Enable RSpec/ExpectActual cop and fix all issues

Always use a variable and not a literal as `expect` argument

Read about cop at http://www.rubydoc.info/gems/rubocop-rspec/RuboCop/Cop/RSpec/ExpectActual
This commit is contained in:
Bertocq
2018-01-07 01:38:33 +01:00
parent 0698043340
commit f6aed3f9f1
9 changed files with 128 additions and 100 deletions

View File

@@ -634,30 +634,36 @@ feature 'Proposals' do
scenario 'Default order is hot_score', :js do
create_featured_proposals
create(:proposal, title: 'Best proposal').update_column(:hot_score, 10)
create(:proposal, title: 'Worst proposal').update_column(:hot_score, 2)
create(:proposal, title: 'Medium proposal').update_column(:hot_score, 5)
best_proposal = create(:proposal, title: 'Best proposal')
best_proposal.update_column(:hot_score, 10)
worst_proposal = create(:proposal, title: 'Worst proposal')
worst_proposal.update_column(:hot_score, 2)
medium_proposal = create(:proposal, title: 'Medium proposal')
medium_proposal.update_column(:hot_score, 5)
visit proposals_path
expect('Best proposal').to appear_before('Medium proposal')
expect('Medium proposal').to appear_before('Worst proposal')
expect(best_proposal.title).to appear_before(medium_proposal.title)
expect(medium_proposal.title).to appear_before(worst_proposal.title)
end
scenario 'Proposals are ordered by confidence_score', :js do
create_featured_proposals
create(:proposal, title: 'Best proposal').update_column(:confidence_score, 10)
create(:proposal, title: 'Worst proposal').update_column(:confidence_score, 2)
create(:proposal, title: 'Medium proposal').update_column(:confidence_score, 5)
best_proposal = create(:proposal, title: 'Best proposal')
best_proposal.update_column(:confidence_score, 10)
worst_proposal = create(:proposal, title: 'Worst proposal')
worst_proposal.update_column(:confidence_score, 2)
medium_proposal = create(:proposal, title: 'Medium proposal')
medium_proposal.update_column(:confidence_score, 5)
visit proposals_path
click_link 'highest rated'
expect(page).to have_selector('a.active', text: 'highest rated')
within '#proposals' do
expect('Best proposal').to appear_before('Medium proposal')
expect('Medium proposal').to appear_before('Worst proposal')
expect(best_proposal.title).to appear_before(medium_proposal.title)
expect(medium_proposal.title).to appear_before(worst_proposal.title)
end
expect(current_url).to include('order=confidence_score')
@@ -667,17 +673,17 @@ feature 'Proposals' do
scenario 'Proposals are ordered by newest', :js do
create_featured_proposals
create(:proposal, title: 'Best proposal', created_at: Time.current)
create(:proposal, title: 'Medium proposal', created_at: Time.current - 1.hour)
create(:proposal, title: 'Worst proposal', created_at: Time.current - 1.day)
best_proposal = create(:proposal, title: 'Best proposal', created_at: Time.current)
medium_proposal = create(:proposal, title: 'Medium proposal', created_at: Time.current - 1.hour)
worst_proposal = create(:proposal, title: 'Worst proposal', created_at: Time.current - 1.day)
visit proposals_path
click_link 'newest'
expect(page).to have_selector('a.active', text: 'newest')
within '#proposals' do
expect('Best proposal').to appear_before('Medium proposal')
expect('Medium proposal').to appear_before('Worst proposal')
expect(best_proposal.title).to appear_before(medium_proposal.title)
expect(medium_proposal.title).to appear_before(worst_proposal.title)
end
expect(current_url).to include('order=created_at')
@@ -686,11 +692,12 @@ feature 'Proposals' do
context 'Recommendations' do
let!(:best_proposal) { create(:proposal, title: 'Best', cached_votes_up: 10, tag_list: "Sport") }
let!(:medium_proposal) { create(:proposal, title: 'Medium', cached_votes_up: 5, tag_list: "Sport") }
let!(:worst_proposal) { create(:proposal, title: 'Worst', cached_votes_up: 1, tag_list: "Sport") }
before do
Setting['feature.user.recommendations'] = true
create(:proposal, title: 'Best', cached_votes_up: 10, tag_list: "Sport")
create(:proposal, title: 'Medium', cached_votes_up: 5, tag_list: "Sport")
create(:proposal, title: 'Worst', cached_votes_up: 1, tag_list: "Sport")
end
after do
@@ -738,8 +745,8 @@ feature 'Proposals' do
expect(page).to have_selector('a.active', text: 'recommendations')
within '#proposals-list' do
expect('Best').to appear_before('Medium')
expect('Medium').to appear_before('Worst')
expect(best_proposal.title).to appear_before(medium_proposal.title)
expect(medium_proposal.title).to appear_before(worst_proposal.title)
end
expect(current_url).to include('order=recommendations')
@@ -1621,14 +1628,17 @@ feature 'Proposals' do
scenario "Orders proposals by votes" do
create(:tag, :category, name: 'culture')
create(:proposal, title: 'Best', tag_list: 'culture').update_column(:confidence_score, 10)
create(:proposal, title: 'Worst', tag_list: 'culture').update_column(:confidence_score, 2)
create(:proposal, title: 'Medium', tag_list: 'culture').update_column(:confidence_score, 5)
best_proposal = create(:proposal, title: 'Best', tag_list: 'culture')
best_proposal.update_column(:confidence_score, 10)
worst_proposal = create(:proposal, title: 'Worst', tag_list: 'culture')
worst_proposal.update_column(:confidence_score, 2)
medium_proposal = create(:proposal, title: 'Medium', tag_list: 'culture')
medium_proposal.update_column(:confidence_score, 5)
visit summary_proposals_path
expect('Best').to appear_before('Medium')
expect('Medium').to appear_before('Worst')
expect(best_proposal.title).to appear_before(medium_proposal.title)
expect(medium_proposal.title).to appear_before(worst_proposal.title)
end
scenario "Displays proposals from last week" do