From f8f3448235f8f8a0a359d1ed5be238ad990c18c7 Mon Sep 17 00:00:00 2001 From: Akira Matsuda Date: Sun, 9 Mar 2025 13:01:06 +0900 Subject: [PATCH] Don't include anything on TOPLEVEL --- spec/decorators/proposal_decorator_spec.rb | 20 +++++----- spec/models/proposal_spec.rb | 44 ++++++++++------------ spec/system/website/configuration_spec.rb | 3 +- 3 files changed, 31 insertions(+), 36 deletions(-) diff --git a/spec/decorators/proposal_decorator_spec.rb b/spec/decorators/proposal_decorator_spec.rb index 2a0d3809c..d2872ac72 100644 --- a/spec/decorators/proposal_decorator_spec.rb +++ b/spec/decorators/proposal_decorator_spec.rb @@ -1,7 +1,5 @@ require 'rails_helper' -include Proposal::State - describe ProposalDecorator do describe "#speaker_names" do it "returns speaker names as a comma separated string" do @@ -27,19 +25,19 @@ describe "#state" do it "returns 'not accepted' for a rejected state" do - proposal = create(:proposal_with_track, state: REJECTED) - expect(proposal.decorate.state).to eq(NOT_ACCEPTED) + proposal = create(:proposal_with_track, state: ProposalDecorator::REJECTED) + expect(proposal.decorate.state).to eq(ProposalDecorator::NOT_ACCEPTED) end it "returns the current state for non-rejected states" do states = [ - ACCEPTED, - WAITLISTED, - WITHDRAWN, - SUBMITTED, - SOFT_ACCEPTED, - SOFT_WAITLISTED, - SOFT_REJECTED + ProposalDecorator::ACCEPTED, + ProposalDecorator::WAITLISTED, + ProposalDecorator::WITHDRAWN, + ProposalDecorator::SUBMITTED, + ProposalDecorator::SOFT_ACCEPTED, + ProposalDecorator::SOFT_WAITLISTED, + ProposalDecorator::SOFT_REJECTED ] states.each do |state| diff --git a/spec/models/proposal_spec.rb b/spec/models/proposal_spec.rb index 92032e4ed..b11765a49 100644 --- a/spec/models/proposal_spec.rb +++ b/spec/models/proposal_spec.rb @@ -1,7 +1,5 @@ require 'rails_helper' -include Proposal::State - describe Proposal do describe "scope :unrated" do it "returns all unrated proposals" do @@ -48,10 +46,10 @@ describe "state methods" do let(:state_method_map) do { - SUBMITTED => :draft?, - WITHDRAWN => :withdrawn?, - ACCEPTED => :accepted?, - WAITLISTED => :waitlisted? + Proposal::SUBMITTED => :draft?, + Proposal::WITHDRAWN => :withdrawn?, + Proposal::ACCEPTED => :accepted?, + Proposal::WAITLISTED => :waitlisted? } end @@ -140,8 +138,7 @@ describe "state changing" do describe "#finalized?" do it "returns false for all soft states" do - soft_states = [ SOFT_ACCEPTED, SOFT_WAITLISTED, - SOFT_REJECTED, SUBMITTED ] + soft_states = [ Proposal::SOFT_ACCEPTED, Proposal::SOFT_WAITLISTED, Proposal::SOFT_REJECTED, Proposal::SUBMITTED ] soft_states.each do |state| proposal = create(:proposal_with_track, state: state) @@ -161,7 +158,7 @@ describe "#becomes_program_session?" do it "returns true for WAITLISTED and ACCEPTED" do - states = [ ACCEPTED, WAITLISTED ] + states = [ Proposal::ACCEPTED, Proposal::WAITLISTED ] states.each do |state| proposal = create(:proposal_with_track, state: state) @@ -170,7 +167,7 @@ end it "returns false for SUBMITTED and REJECTED" do - states = [ SUBMITTED, REJECTED ] + states = [ Proposal::SUBMITTED, Proposal::REJECTED ] states.each do |state| proposal = create(:proposal_with_track, state: state) @@ -189,16 +186,16 @@ end it "changes a SUBMITTED proposal to REJECTED" do - proposal = create(:proposal_with_track, state: SUBMITTED) + proposal = create(:proposal_with_track, state: Proposal::SUBMITTED) expect(proposal.finalize).to be_truthy - expect(proposal.reload.state).to eq(REJECTED) + expect(proposal.reload.state).to eq(Proposal::REJECTED) end it "creates a draft program session for WAITLISTED and ACCEPTED proposals, but not for REJECTED or SUBMITTED" do - waitlisted_proposal = create(:proposal_with_track, state: SOFT_WAITLISTED) - accepted_proposal = create(:proposal_with_track, state: SOFT_ACCEPTED) - rejected_proposal = create(:proposal_with_track, state: SOFT_REJECTED) - submitted_proposal = create(:proposal_with_track, state: SUBMITTED) + waitlisted_proposal = create(:proposal_with_track, state: Proposal::SOFT_WAITLISTED) + accepted_proposal = create(:proposal_with_track, state: Proposal::SOFT_ACCEPTED) + rejected_proposal = create(:proposal_with_track, state: Proposal::SOFT_REJECTED) + submitted_proposal = create(:proposal_with_track, state: Proposal::SUBMITTED) Proposal.all.each do |prop| prop.finalize @@ -213,13 +210,13 @@ describe "#update_state" do it "updates the state" do - proposal = create(:proposal_with_track, state: ACCEPTED) - proposal.update_state(WAITLISTED) - expect(proposal.state).to eq(WAITLISTED) + proposal = create(:proposal_with_track, state: Proposal::ACCEPTED) + proposal.update_state(Proposal::WAITLISTED) + expect(proposal.state).to eq(Proposal::WAITLISTED) end it "rejects invalid states" do - proposal = create(:proposal_with_track, state: ACCEPTED) + proposal = create(:proposal_with_track, state: Proposal::ACCEPTED) proposal.update_state('almonds!') expect(proposal.errors.messages[:state][0]).to eq("'almonds!' not a valid state.") end @@ -503,15 +500,14 @@ describe "#withdraw" do it "sets proposal's state to withdrawn" do - proposal = create(:proposal_with_track, state: SUBMITTED) + proposal = create(:proposal_with_track, state: Proposal::SUBMITTED) proposal.withdraw - expect(proposal.state).to eq(WITHDRAWN) + expect(proposal.state).to eq(Proposal::WITHDRAWN) end it "sends a notification to reviewers" do - proposal = create(:proposal_with_track, :with_reviewer_public_comment, - state: SUBMITTED) + proposal = create(:proposal_with_track, :with_reviewer_public_comment, state: Proposal::SUBMITTED) expect { proposal.withdraw }.to change { Notification.count }.by(1) diff --git a/spec/system/website/configuration_spec.rb b/spec/system/website/configuration_spec.rb index f46dd12bb..df75a69e3 100644 --- a/spec/system/website/configuration_spec.rb +++ b/spec/system/website/configuration_spec.rb @@ -1,7 +1,8 @@ require 'rails_helper' -include ActionView::Helpers::SanitizeHelper feature "Website Configuration", type: :system do + include ActionView::Helpers::SanitizeHelper + let(:event) { create(:event) } let(:organizer) { create(:organizer, event: event) }