From 07e4727831d569a068eb8773fa3b3ac4f1a63202 Mon Sep 17 00:00:00 2001 From: tamsin johnson Date: Wed, 10 Jun 2020 10:24:57 -0700 Subject: [PATCH] style: fix LetBeforeExamples --- .rubocop_fixme.yml | 9 -------- .../forms/hyrax/forms/collection_form_spec.rb | 10 ++++----- .../hyrax/collection_presenter_spec.rb | 22 +++++++++---------- .../presenters/hyrax/trophy_presenter_spec.rb | 6 ++--- .../workflow/action_taken_service_spec.rb | 12 +++++----- .../workflow/notification_service_spec.rb | 12 +++++----- 6 files changed, 31 insertions(+), 40 deletions(-) diff --git a/.rubocop_fixme.yml b/.rubocop_fixme.yml index a73c9cfbd9..99fb555ace 100644 --- a/.rubocop_fixme.yml +++ b/.rubocop_fixme.yml @@ -156,15 +156,6 @@ RSpec/AnyInstance: RSpec/ExpectInHook: Enabled: false -# Offense count: 31 -RSpec/LetBeforeExamples: - Exclude: - - 'spec/forms/hyrax/forms/collection_form_spec.rb' - - 'spec/presenters/hyrax/collection_presenter_spec.rb' - - 'spec/presenters/hyrax/trophy_presenter_spec.rb' - - 'spec/services/hyrax/workflow/action_taken_service_spec.rb' - - 'spec/services/hyrax/workflow/notification_service_spec.rb' - # Offense count: 27 # Configuration parameters: EnforcedStyle, SupportedStyles. # SupportedStyles: and_return, block diff --git a/spec/forms/hyrax/forms/collection_form_spec.rb b/spec/forms/hyrax/forms/collection_form_spec.rb index 603660dc54..fe7152239a 100644 --- a/spec/forms/hyrax/forms/collection_form_spec.rb +++ b/spec/forms/hyrax/forms/collection_form_spec.rb @@ -2,6 +2,11 @@ describe "#terms" do subject { described_class.terms } + let(:collection) { build(:collection_lw) } + let(:ability) { Ability.new(create(:user)) } + let(:repository) { double } + let(:form) { described_class.new(collection, ability, repository) } + it do is_expected.to eq [:alternative_title, :resource_type, @@ -25,11 +30,6 @@ end end - let(:collection) { build(:collection_lw) } - let(:ability) { Ability.new(create(:user)) } - let(:repository) { double } - let(:form) { described_class.new(collection, ability, repository) } - describe "#primary_terms" do subject { form.primary_terms } diff --git a/spec/presenters/hyrax/collection_presenter_spec.rb b/spec/presenters/hyrax/collection_presenter_spec.rb index 4bd5cf1337..ab3f2f4fff 100644 --- a/spec/presenters/hyrax/collection_presenter_spec.rb +++ b/spec/presenters/hyrax/collection_presenter_spec.rb @@ -1,15 +1,4 @@ RSpec.describe Hyrax::CollectionPresenter do - describe ".terms" do - subject { described_class.terms } - - it do - is_expected.to eq [:total_items, :size, :resource_type, :creator, - :contributor, :keyword, :license, :publisher, - :date_created, :subject, :language, :identifier, - :based_near, :related_url] - end - end - let(:collection) do build(:collection_lw, id: 'adc12v', @@ -25,6 +14,17 @@ let(:presenter) { described_class.new(solr_doc, ability) } let(:solr_doc) { SolrDocument.new(collection.to_solr) } + describe ".terms" do + subject { described_class.terms } + + it do + is_expected.to eq [:total_items, :size, :resource_type, :creator, + :contributor, :keyword, :license, :publisher, + :date_created, :subject, :language, :identifier, + :based_near, :related_url] + end + end + describe "collection type methods" do subject { presenter } diff --git a/spec/presenters/hyrax/trophy_presenter_spec.rb b/spec/presenters/hyrax/trophy_presenter_spec.rb index e50953ed26..40773c6f74 100644 --- a/spec/presenters/hyrax/trophy_presenter_spec.rb +++ b/spec/presenters/hyrax/trophy_presenter_spec.rb @@ -1,4 +1,7 @@ RSpec.describe Hyrax::TrophyPresenter do + let(:presenter) { described_class.new(solr_document) } + let(:solr_document) { SolrDocument.new(id: '123456', has_model_ssim: 'GenericWork', title_tesim: ['A Title']) } + describe "find_by_user" do let(:user) { create(:user) } let(:work1) { create(:work, user: user) } @@ -16,9 +19,6 @@ end end - let(:presenter) { described_class.new(solr_document) } - let(:solr_document) { SolrDocument.new(id: '123456', has_model_ssim: 'GenericWork', title_tesim: ['A Title']) } - describe "id" do subject { presenter.id } diff --git a/spec/services/hyrax/workflow/action_taken_service_spec.rb b/spec/services/hyrax/workflow/action_taken_service_spec.rb index b5c8cbbf9a..58ecafe0a8 100644 --- a/spec/services/hyrax/workflow/action_taken_service_spec.rb +++ b/spec/services/hyrax/workflow/action_taken_service_spec.rb @@ -1,10 +1,4 @@ RSpec.describe Hyrax::Workflow::ActionTakenService do - context 'class methods' do - subject { described_class } - - it { is_expected.to respond_to(:handle_action_taken) } - end - let(:triggered_methods) { [instance_double(Sipity::Method, service_name: 'FooBar')] } let(:triggered_methods_rel) do double('Sipity::Method::ActiveRecord_Relation', @@ -21,6 +15,12 @@ user: user) end + context 'class methods' do + subject { described_class } + + it { is_expected.to respond_to(:handle_action_taken) } + end + describe "#call" do subject { instance.call } diff --git a/spec/services/hyrax/workflow/notification_service_spec.rb b/spec/services/hyrax/workflow/notification_service_spec.rb index 057627d2f9..a3e54d5612 100644 --- a/spec/services/hyrax/workflow/notification_service_spec.rb +++ b/spec/services/hyrax/workflow/notification_service_spec.rb @@ -1,10 +1,4 @@ RSpec.describe Hyrax::Workflow::NotificationService do - context 'class methods' do - subject { described_class } - - it { is_expected.to respond_to(:deliver_on_action_taken) } - end - let(:creating_user) { Sipity::Role.new(name: 'creating_user') } let(:recipient1) do Sipity::NotificationRecipient.new(recipient_strategy: 'to', @@ -30,6 +24,12 @@ user: user) end + context 'class methods' do + subject { described_class } + + it { is_expected.to respond_to(:deliver_on_action_taken) } + end + describe "#call" do subject { instance.call }