diff --git a/spec/dummy/config/environments/test.rb b/spec/dummy/config/environments/test.rb index 1d62e91..4782029 100644 --- a/spec/dummy/config/environments/test.rb +++ b/spec/dummy/config/environments/test.rb @@ -7,6 +7,7 @@ Rails.application.configure do # Settings specified here will take precedence over those in config/application.rb. config.cache_classes = false + config.active_record.legacy_connection_handling = false # Do not eager load code on boot. This avoids loading your whole application # just for the purpose of running a single test. If you are using a tool that diff --git a/spec/dummy/config/initializers/assets.rb b/spec/dummy/config/initializers/assets.rb index fe48fc3..9c7a620 100644 --- a/spec/dummy/config/initializers/assets.rb +++ b/spec/dummy/config/initializers/assets.rb @@ -1,7 +1,7 @@ # Be sure to restart your server when you modify this file. # Version of your assets, change this if you want to expire all your assets. -Rails.application.config.assets.version = '1.0' +# Rails.application.config.assets.version = '1.0' # Add additional assets to the asset load path. # Rails.application.config.assets.paths << Emoji.images_path diff --git a/spec/setup_association_spec.rb b/spec/setup_association_spec.rb index dc26832..908c810 100644 --- a/spec/setup_association_spec.rb +++ b/spec/setup_association_spec.rb @@ -9,15 +9,15 @@ describe Impressionist::SetupAssociation do let(:setup_association) { described_class.new(mock) } it 'will include when togglable' do - allow(mock).to receive(:attr_accessible).with(any_args).and_return(true) + allow(mock).to receive(:attr_accessible).and_return(true) allow(setup_association).to receive(:toggle).and_return(true) - allow(setup_association).to be_include_attr_acc + expect(setup_association).to be_include_attr_acc end it 'will not include if it is not togglable' do allow(setup_association).to receive(:toggle).and_return(false) - allow(setup_association).not_to be_include_attr_acc + expect(setup_association).not_to be_include_attr_acc end context 'when using rails >= 5' do