From 22e09ed2939da910625d8053d7c85a9b630adcf2 Mon Sep 17 00:00:00 2001 From: Marc Anguera Insa Date: Thu, 30 Aug 2018 20:52:48 +0200 Subject: [PATCH] Use RSpec scope and avoid global namespace access. More info: https://relishapp.com/rspec/rspec-core/v/3-0/docs/configuration/global-namespace-dsl Closes #362 --- spec/controllers/device_tokens_controller_spec.rb | 2 +- spec/controllers/inquiries_controller_spec.rb | 2 +- spec/controllers/reports_controller_spec.rb | 2 +- spec/controllers/sessions_controller_spec.rb | 2 +- spec/controllers/tags_controller_spec.rb | 2 +- spec/controllers/transfers_controller_spec.rb | 2 +- spec/controllers/users_controller_spec.rb | 2 +- spec/decorators/member_decorator_spec.rb | 2 +- spec/decorators/member_report_decorator_spec.rb | 2 +- spec/decorators/post_report_decorator_spec.rb | 2 +- spec/features/create_offer_spec.rb | 2 +- spec/features/sign_in_spec.rb | 2 +- spec/features/sign_out_spec.rb | 2 +- spec/features/transfer_spec.rb | 2 +- spec/mailers/organization_notifier_spec.rb | 2 +- spec/models/account_spec.rb | 2 +- spec/models/event_spec.rb | 2 +- spec/models/member_spec.rb | 2 +- spec/models/organization_spec.rb | 2 +- spec/models/taggable_spec.rb | 2 +- spec/models/transfer_factory_spec.rb | 2 +- spec/models/transfer_sources_options_spec.rb | 2 +- spec/models/user_spec.rb | 2 +- spec/services/persister/member_persister_spec.rb | 2 +- spec/services/persister/transfer_persister_spec.rb | 2 +- spec/spec_helper.rb | 3 +++ 26 files changed, 28 insertions(+), 25 deletions(-) diff --git a/spec/controllers/device_tokens_controller_spec.rb b/spec/controllers/device_tokens_controller_spec.rb index 75c5a4af8..5f2afde64 100644 --- a/spec/controllers/device_tokens_controller_spec.rb +++ b/spec/controllers/device_tokens_controller_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe DeviceTokensController do +RSpec.describe DeviceTokensController do let (:organization) { Fabricate(:organization) } let (:member) { Fabricate(:member, organization: organization) } diff --git a/spec/controllers/inquiries_controller_spec.rb b/spec/controllers/inquiries_controller_spec.rb index 75d7cf125..694be650f 100644 --- a/spec/controllers/inquiries_controller_spec.rb +++ b/spec/controllers/inquiries_controller_spec.rb @@ -1,6 +1,6 @@ require "spec_helper" -describe InquiriesController do +RSpec.describe InquiriesController do let (:test_organization) { Fabricate(:organization) } let (:member) { Fabricate(:member, organization: test_organization) } let (:another_member) { Fabricate(:member, organization: test_organization) } diff --git a/spec/controllers/reports_controller_spec.rb b/spec/controllers/reports_controller_spec.rb index a6b99aa77..ec0636bbc 100644 --- a/spec/controllers/reports_controller_spec.rb +++ b/spec/controllers/reports_controller_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe ReportsController do +RSpec.describe ReportsController do let (:test_organization) { Fabricate(:organization) } let (:member1) { Fabricate(:member, organization: test_organization) } let (:member2) { Fabricate(:member, organization: test_organization) } diff --git a/spec/controllers/sessions_controller_spec.rb b/spec/controllers/sessions_controller_spec.rb index 5ac1c2354..d81029b6d 100644 --- a/spec/controllers/sessions_controller_spec.rb +++ b/spec/controllers/sessions_controller_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe SessionsController do +RSpec.describe SessionsController do let(:user) do Fabricate(:user, password: 'papapa22', password_confirmation: 'papapa22') end diff --git a/spec/controllers/tags_controller_spec.rb b/spec/controllers/tags_controller_spec.rb index 16b8f43d0..a2192222a 100644 --- a/spec/controllers/tags_controller_spec.rb +++ b/spec/controllers/tags_controller_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe TagsController do +RSpec.describe TagsController do let (:tags) { %w(foo bar baz) } let (:organization) { Fabricate(:organization) } let (:member) { Fabricate(:member, organization: organization) } diff --git a/spec/controllers/transfers_controller_spec.rb b/spec/controllers/transfers_controller_spec.rb index de6dfb00c..7eff15bb6 100644 --- a/spec/controllers/transfers_controller_spec.rb +++ b/spec/controllers/transfers_controller_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe TransfersController do +RSpec.describe TransfersController do let (:test_organization) { Fabricate(:organization) } let (:member_admin) { Fabricate(:member, organization: test_organization, manager: true) } let (:member_giver) { Fabricate(:member, organization: test_organization) } diff --git a/spec/controllers/users_controller_spec.rb b/spec/controllers/users_controller_spec.rb index 09234ba9b..552c5f4c5 100644 --- a/spec/controllers/users_controller_spec.rb +++ b/spec/controllers/users_controller_spec.rb @@ -1,6 +1,6 @@ require "spec_helper" -describe UsersController do +RSpec.describe UsersController do let(:test_organization) { Fabricate(:organization) } let(:member_admin) do Fabricate(:member, diff --git a/spec/decorators/member_decorator_spec.rb b/spec/decorators/member_decorator_spec.rb index 006596390..765994091 100644 --- a/spec/decorators/member_decorator_spec.rb +++ b/spec/decorators/member_decorator_spec.rb @@ -1,6 +1,6 @@ require "spec_helper" -describe MemberDecorator do +RSpec.describe MemberDecorator do let(:org) { Fabricate(:organization) } let(:member) { Fabricate(:member, organization: org) } let(:view_context) { ApplicationController.new.view_context } diff --git a/spec/decorators/member_report_decorator_spec.rb b/spec/decorators/member_report_decorator_spec.rb index b3142c58e..daf3fbbdb 100644 --- a/spec/decorators/member_report_decorator_spec.rb +++ b/spec/decorators/member_report_decorator_spec.rb @@ -1,6 +1,6 @@ require "spec_helper" -describe MemberReportDecorator do +RSpec.describe MemberReportDecorator do let (:member) { Fabricate(:member) } let (:org) { member.organization } let (:decorator) do diff --git a/spec/decorators/post_report_decorator_spec.rb b/spec/decorators/post_report_decorator_spec.rb index be4efa690..48dd2b6bc 100644 --- a/spec/decorators/post_report_decorator_spec.rb +++ b/spec/decorators/post_report_decorator_spec.rb @@ -1,6 +1,6 @@ require "spec_helper" -describe PostReportDecorator do +RSpec.describe PostReportDecorator do let (:org) { Fabricate(:organization) } let (:member) { Fabricate(:member, organization: org) } let (:category) { Fabricate(:category) } diff --git a/spec/features/create_offer_spec.rb b/spec/features/create_offer_spec.rb index 1a7c2de07..75b9a107d 100644 --- a/spec/features/create_offer_spec.rb +++ b/spec/features/create_offer_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -feature 'create offer' do +RSpec.feature 'create offer' do let(:user) do user = Fabricate( :user, diff --git a/spec/features/sign_in_spec.rb b/spec/features/sign_in_spec.rb index a7abc778d..bad23fd2a 100644 --- a/spec/features/sign_in_spec.rb +++ b/spec/features/sign_in_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -feature 'sign in' do +RSpec.feature 'sign in' do let(:user) do Fabricate(:user, email: 'user@timeoverflow.org', password: 'papapa22') end diff --git a/spec/features/sign_out_spec.rb b/spec/features/sign_out_spec.rb index 7199b6fa0..e22196410 100644 --- a/spec/features/sign_out_spec.rb +++ b/spec/features/sign_out_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -feature 'sign out' do +RSpec.feature 'sign out' do let!(:user) do Fabricate( :user, diff --git a/spec/features/transfer_spec.rb b/spec/features/transfer_spec.rb index 3573a3dfc..8a8bfbb95 100644 --- a/spec/features/transfer_spec.rb +++ b/spec/features/transfer_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -feature 'time transfer' do +RSpec.feature 'time transfer' do let(:user) do user = Fabricate( :user, diff --git a/spec/mailers/organization_notifier_spec.rb b/spec/mailers/organization_notifier_spec.rb index f5a09fb14..52bfec384 100644 --- a/spec/mailers/organization_notifier_spec.rb +++ b/spec/mailers/organization_notifier_spec.rb @@ -1,6 +1,6 @@ require "spec_helper" -describe OrganizationNotifier do +RSpec.describe OrganizationNotifier do let (:test_organization) { Fabricate(:organization) } let! (:offer) { Fabricate(:offer, organization: test_organization) } let! (:inquiry) { Fabricate(:inquiry, organization: test_organization) } diff --git a/spec/models/account_spec.rb b/spec/models/account_spec.rb index ba6176fd1..9a42ee4e1 100644 --- a/spec/models/account_spec.rb +++ b/spec/models/account_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe Account do +RSpec.describe Account do let(:member) { Fabricate(:member) } let(:organization) { member.organization } let(:user) { member.user } diff --git a/spec/models/event_spec.rb b/spec/models/event_spec.rb index 2961fc2ee..4c9b3610d 100644 --- a/spec/models/event_spec.rb +++ b/spec/models/event_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe Event do +RSpec.describe Event do describe 'Validations' do it { is_expected.to validate_presence_of(:action) } it do diff --git a/spec/models/member_spec.rb b/spec/models/member_spec.rb index 531379fbc..7b124ac05 100644 --- a/spec/models/member_spec.rb +++ b/spec/models/member_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe Member do +RSpec.describe Member do subject(:member) { Fabricate(:member) } it { is_expected.to belong_to(:user) } diff --git a/spec/models/organization_spec.rb b/spec/models/organization_spec.rb index 10e3db473..a7cc30296 100644 --- a/spec/models/organization_spec.rb +++ b/spec/models/organization_spec.rb @@ -1,6 +1,6 @@ require "spec_helper" -describe Organization do +RSpec.describe Organization do let(:organization) { Fabricate(:organization) } describe '#display_id' do diff --git a/spec/models/taggable_spec.rb b/spec/models/taggable_spec.rb index 771b7a04e..61d5638be 100644 --- a/spec/models/taggable_spec.rb +++ b/spec/models/taggable_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe Taggable do +RSpec.describe Taggable do let(:organization) { Fabricate(:organization) } let!(:offer) do diff --git a/spec/models/transfer_factory_spec.rb b/spec/models/transfer_factory_spec.rb index cc2767162..a1d8df085 100644 --- a/spec/models/transfer_factory_spec.rb +++ b/spec/models/transfer_factory_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe TransferFactory do +RSpec.describe TransferFactory do let(:transfer_factory) do described_class.new( organization, diff --git a/spec/models/transfer_sources_options_spec.rb b/spec/models/transfer_sources_options_spec.rb index 1518d9cec..90ee6f9bf 100644 --- a/spec/models/transfer_sources_options_spec.rb +++ b/spec/models/transfer_sources_options_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe TransferSourcesOptions do +RSpec.describe TransferSourcesOptions do let(:transfer_sources_options) do described_class.new(sources, destination_accountable) end diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 77c7d56cb..c37a39111 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -1,6 +1,6 @@ require "spec_helper" -describe User do +RSpec.describe User do it { is_expected.to have_many :members } it { is_expected.to accept_nested_attributes_for :members } it { is_expected.to have_many :organizations } diff --git a/spec/services/persister/member_persister_spec.rb b/spec/services/persister/member_persister_spec.rb index 7377ee375..c6ec7f50b 100644 --- a/spec/services/persister/member_persister_spec.rb +++ b/spec/services/persister/member_persister_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe Persister::MemberPersister do +RSpec.describe Persister::MemberPersister do let(:organization) { Fabricate(:organization) } let(:user) { Fabricate(:user) } let(:member) { Fabricate.build(:member, user: user, organization: organization) } diff --git a/spec/services/persister/transfer_persister_spec.rb b/spec/services/persister/transfer_persister_spec.rb index 89acc338b..15996ee75 100644 --- a/spec/services/persister/transfer_persister_spec.rb +++ b/spec/services/persister/transfer_persister_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe Persister::TransferPersister do +RSpec.describe Persister::TransferPersister do let(:source_account) { Fabricate(:account) } let(:destination_account) { Fabricate(:account) } let(:organization) { Fabricate(:organization) } diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index b33a21212..894bd9ac4 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -63,6 +63,9 @@ # rspec-rails. config.infer_base_class_for_anonymous_controllers = false + # Disable global namespace monkey patching. + config.expose_dsl_globally = false + # Run specs in random order to surface order dependencies. If you find an # order dependency and want to debug it, you can fix the order by providing # the seed, which is printed after each run.