diff --git a/.rubocop.yml b/.rubocop.yml index 37c46bef1..8f52dad0d 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -253,9 +253,6 @@ RSpec/LeadingSubject: RSpec/LetBeforeExamples: Enabled: true -RSpec/LetSetup: - Enabled: true - RSpec/MessageChain: Enabled: true diff --git a/.rubocop_basic.yml b/.rubocop_basic.yml index 269326ad2..2301d4072 100644 --- a/.rubocop_basic.yml +++ b/.rubocop_basic.yml @@ -163,6 +163,9 @@ Rails/Validation: RSpec/ExampleWording: Enabled: true +RSpec/LetSetup: + Enabled: true + RSpec/NotToNot: Enabled: true diff --git a/spec/features/notifications_spec.rb b/spec/features/notifications_spec.rb index c998ac62e..8bf3acb5d 100644 --- a/spec/features/notifications_spec.rb +++ b/spec/features/notifications_spec.rb @@ -186,11 +186,11 @@ describe "Notifications" do let!(:user2) { create(:user) } let!(:user3) { create(:user) } let!(:proposal_notification) { create(:proposal_notification) } - let!(:notification1) { create(:notification, notifiable: proposal_notification, user: user1) } - let!(:notification2) { create(:notification, notifiable: proposal_notification, user: user2) } - let!(:notification3) { create(:notification, notifiable: proposal_notification, user: user3) } before do + create(:notification, notifiable: proposal_notification, user: user1) + create(:notification, notifiable: proposal_notification, user: user2) + create(:notification, notifiable: proposal_notification, user: user3) reset_mailer Delayed::Worker.delay_jobs = true end diff --git a/spec/features/polls/votation_type_spec.rb b/spec/features/polls/votation_type_spec.rb index 1a42d7b40..ffc477c9f 100644 --- a/spec/features/polls/votation_type_spec.rb +++ b/spec/features/polls/votation_type_spec.rb @@ -63,12 +63,13 @@ describe "Poll Votation Type" do let(:poll_current) { create(:poll, :current) } let(:question) { create(:poll_question_multiple, poll: poll_current) } let!(:answer1) { create(:poll_question_answer, question: question, title: "answer_1") } - let!(:answer2) { create(:poll_question_answer, question: question, title: "answer_2") } - let!(:answer3) { create(:poll_question_answer, question: question, title: "answer_3") } - let!(:answer4) { create(:poll_question_answer, question: question, title: "answer_4") } - let!(:answer5) { create(:poll_question_answer, question: question, title: "answer_5") } before do + create(:poll_question_answer, question: question, title: "answer_2") + create(:poll_question_answer, question: question, title: "answer_3") + create(:poll_question_answer, question: question, title: "answer_4") + create(:poll_question_answer, question: question, title: "answer_5") + login_as(user) end @@ -152,13 +153,14 @@ describe "Poll Votation Type" do let(:user) { create(:user, :verified) } let(:poll_current) { create(:poll, :current) } let(:question) { create(:poll_question_prioritized, poll: poll_current) } - let!(:answer1) { create(:poll_question_answer, question: question, title: "answer_1") } - let!(:answer2) { create(:poll_question_answer, question: question, title: "answer_2") } - let!(:answer3) { create(:poll_question_answer, question: question, title: "answer_3") } - let!(:answer4) { create(:poll_question_answer, question: question, title: "answer_4") } - let!(:answer5) { create(:poll_question_answer, question: question, title: "answer_5") } before do + create(:poll_question_answer, question: question, title: "answer_1") + create(:poll_question_answer, question: question, title: "answer_2") + create(:poll_question_answer, question: question, title: "answer_3") + create(:poll_question_answer, question: question, title: "answer_4") + create(:poll_question_answer, question: question, title: "answer_5") + login_as(user) end @@ -218,12 +220,13 @@ describe "Poll Votation Type" do let(:poll_current) { create(:poll, :current) } let(:question) { create(:poll_question_positive_open, poll: poll_current) } let!(:answer1) { create(:poll_question_answer, question: question, title: "answer_1") } - let!(:answer2) { create(:poll_question_answer, question: question, title: "answer_2") } - let!(:answer3) { create(:poll_question_answer, question: question, title: "answer_3") } - let!(:answer4) { create(:poll_question_answer, question: question, title: "answer_4") } - let!(:answer5) { create(:poll_question_answer, question: question, title: "answer_5") } before do + create(:poll_question_answer, question: question, title: "answer_2") + create(:poll_question_answer, question: question, title: "answer_3") + create(:poll_question_answer, question: question, title: "answer_4") + create(:poll_question_answer, question: question, title: "answer_5") + login_as(user) end @@ -324,13 +327,14 @@ describe "Poll Votation Type" do let(:user) { create(:user, :verified) } let(:poll_current) { create(:poll, :current) } let(:question) { create(:poll_question_answer_set_open, poll: poll_current) } - let!(:answer1) { create(:poll_question_answer, question: question, title: "answer_1") } - let!(:answer2) { create(:poll_question_answer, question: question, title: "answer_2") } - let!(:answer3) { create(:poll_question_answer, question: question, title: "answer_3") } - let!(:answer4) { create(:poll_question_answer, question: question, title: "answer_4") } - let!(:answer5) { create(:poll_question_answer, question: question, title: "answer_5") } before do + create(:poll_question_answer, question: question, title: "answer_1") + create(:poll_question_answer, question: question, title: "answer_2") + create(:poll_question_answer, question: question, title: "answer_3") + create(:poll_question_answer, question: question, title: "answer_4") + create(:poll_question_answer, question: question, title: "answer_5") + login_as(user) end diff --git a/spec/features/polls/voter_spec.rb b/spec/features/polls/voter_spec.rb index 760957254..f444df31a 100644 --- a/spec/features/polls/voter_spec.rb +++ b/spec/features/polls/voter_spec.rb @@ -83,7 +83,7 @@ describe "Voter" do end context "The person has decided not to vote at this time" do - let!(:user) { create(:user, :in_census) } + before { create(:user, :in_census) } scenario "Show not to vote at this time button" do login_through_form_as_officer(officer.user) diff --git a/spec/mailers/dashboard/mailer_spec.rb b/spec/mailers/dashboard/mailer_spec.rb index 4751a51eb..fff03da78 100644 --- a/spec/mailers/dashboard/mailer_spec.rb +++ b/spec/mailers/dashboard/mailer_spec.rb @@ -221,13 +221,12 @@ describe Dashboard::Mailer do before do ActionMailer::Base.deliveries.clear + + create(:dashboard_action, :resource, :active, day_offset: 0, published_proposal: true) + create(:dashboard_action, :proposed_action, :active, day_offset: 0, published_proposal: true) end let!(:proposal) { build(:proposal, :draft) } - let!(:resource) { create(:dashboard_action, :resource, :active, day_offset: 0, - published_proposal: true) } - let!(:proposed_action) { create(:dashboard_action, :proposed_action, :active, day_offset: 0, - published_proposal: true) } it "Disables email delivery using setting" do Setting["dashboard.emails"] = nil diff --git a/spec/models/newsletter_spec.rb b/spec/models/newsletter_spec.rb index cdde03e7f..364250255 100644 --- a/spec/models/newsletter_spec.rb +++ b/spec/models/newsletter_spec.rb @@ -66,12 +66,12 @@ describe Newsletter do describe "#deliver" do let!(:proposals) { Array.new(3) { create(:proposal) } } - let!(:debate) { create(:debate) } let!(:recipients) { proposals.map(&:author).map(&:email) } let!(:newsletter) { create(:newsletter, segment_recipient: "proposal_authors") } before do + create(:debate) reset_mailer Delayed::Worker.delay_jobs = true end diff --git a/spec/models/poll/ballot_spec.rb b/spec/models/poll/ballot_spec.rb index 8e449a533..f48a5dc6a 100644 --- a/spec/models/poll/ballot_spec.rb +++ b/spec/models/poll/ballot_spec.rb @@ -9,7 +9,7 @@ describe Poll::Ballot do let(:poll) { create(:poll, budget: budget) } let(:poll_ballot_sheet) { create(:poll_ballot_sheet, poll: poll) } let(:poll_ballot) { create(:poll_ballot, ballot_sheet: poll_ballot_sheet, external_id: 1, data: investment.id) } - let!(:ballot) { create(:budget_ballot, budget: budget, physical: true, poll_ballot: poll_ballot) } + before { create(:budget_ballot, budget: budget, physical: true, poll_ballot: poll_ballot) } describe "#verify" do