Use RSpec scope and avoid global namespace

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) }
 

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) }

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) }

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

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) }

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) }

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,

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 }

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

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) }

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,

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

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,

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,

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) }

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 }

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

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) }

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

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

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,

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

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 }

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) }

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) }

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.