Update for rspec3 rails_helpers config, fix shoulda matchers

app/concerns/sortable_events.rb

@@ -11,7 +11,7 @@ module SortableEvents
 
   module ClassMethods
     def can_order_created_events!
-      raise if cannot_create_events?
+      raise 'Cannot order events for agent that cannot create events' if cannot_create_events?
       prepend AutomaticSorter
     end
 

spec/concerns/dry_runnable_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe DryRunnable do
   class Agents::SandboxedAgent < Agent

spec/concerns/form_configurable_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe FormConfigurable do
   class Agent1

spec/concerns/inheritance_tracking_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'inheritance_tracking'
 
 describe InheritanceTracking do

spec/concerns/liquid_droppable_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe LiquidDroppable do
   before do

spec/concerns/liquid_interpolatable_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'nokogiri'
 
 describe LiquidInterpolatable::Filters do

spec/concerns/long_runnable_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe LongRunnable do
   class LongRunnableAgent < Agent

spec/concerns/sortable_events_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe SortableEvents do
   let(:agent_class) {
@@ -152,7 +152,7 @@ describe SortableEvents do
             passive_agent_class.class_eval do
               can_order_created_events!
             end
-          }.to raise_error
+          }.to raise_error('Cannot order events for agent that cannot create events')
         end
 
         it 'should work if called from an Agent that can create events' do
@@ -160,7 +160,7 @@ describe SortableEvents do
             active_agent_class.class_eval do
               can_order_created_events!
             end
-          }.not_to raise_error
+          }.not_to raise_error()
         end
       end
 

spec/controllers/agents_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe AgentsController do
   def valid_attributes(options = {})

spec/controllers/concerns/sortable_table_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe SortableTable do
   class SortableTestController

spec/controllers/events_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe EventsController do
   before do

spec/controllers/jobs_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe JobsController do
   describe "GET index" do

spec/controllers/logs_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe LogsController do
   describe "GET index" do

spec/controllers/omniauth_callbacks_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe OmniauthCallbacksController do
   before do

spec/controllers/scenario_imports_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe ScenarioImportsController do
   before do

spec/controllers/scenarios_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe ScenariosController do
   def valid_attributes(options = {})

spec/controllers/services_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe ServicesController do
   before do

spec/controllers/user_credentials_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe UserCredentialsController do
   def valid_attributes(options = {})

spec/controllers/web_requests_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe WebRequestsController do
   class Agents::WebRequestReceiverAgent < Agent

spec/helpers/application_helper_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe ApplicationHelper do
   describe '#icon_tag' do

spec/helpers/dot_helper_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe DotHelper do
   describe "with example Agents" do

spec/helpers/jobs_helper_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe JobsHelper do
   let(:job) { Delayed::Job.new }

spec/helpers/markdown_helper_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe MarkdownHelper do
 

spec/helpers/scenario_helper_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe ScenarioHelper do
   let(:scenario) { users(:bob).scenarios.build(name: 'Scene', tag_fg_color: '#AAAAAA', tag_bg_color: '#000000') }

spec/lib/agent_runner_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe AgentRunner do
   context "without traps" do

spec/lib/agents_exporter_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require 'spec_helper'
+require 'rails_helper'
 
 describe AgentsExporter do
   describe "#as_json" do

spec/lib/delayed_job_worker_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe DelayedJobWorker do
   before do

spec/lib/huginn_scheduler_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'huginn_scheduler'
 
 describe HuginnScheduler do

spec/lib/liquid_migrator_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe LiquidMigrator do
   describe "converting JSONPath strings" do

spec/lib/location_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Location do
   let(:location) {
@@ -30,14 +30,14 @@ describe Location do
     expect(location['lat']).to eq 2.0
   end
 
-  it "has a convencience accessor for combined latitude and longitude" do
+  it "has a convenience accessor for combined latitude and longitude" do
     expect(location.latlng).to eq "2.0,3.0"
   end
 
   it "does not allow hash-style assignment" do
     expect {
       location[:lat] = 2.0
-    }.to raise_error
+    }.to raise_error(NoMethodError)
   end
 
   it "ignores invalid values" do

spec/lib/utils_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Utils do
   describe "#unindent" do

spec/models/agent_log_spec.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-require 'spec_helper'
+require 'rails_helper'
 
 describe AgentLog do
   describe "validations" do

spec/models/agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agent do
   it_behaves_like WorkingHelpers
@@ -223,7 +223,7 @@ describe Agent do
         mock(Agent).find(@checker.id) { @checker }
         expect {
           Agents::SomethingSource.async_check(@checker.id)
-        }.to raise_error
+        }.to raise_error(RuntimeError)
         log = @checker.logs.first
         expect(log.message).to match(/Exception/)
         expect(log.level).to eq(4)
@@ -263,7 +263,7 @@ describe Agent do
         Agent.async_check(agents(:bob_weather_agent).id)
         expect {
           Agent.async_receive(agents(:bob_rain_notifier_agent).id, [agents(:bob_weather_agent).events.last.id])
-        }.to raise_error
+        }.to raise_error(RuntimeError)
         log = agents(:bob_rain_notifier_agent).logs.first
         expect(log.message).to match(/Exception/)
         expect(log.level).to eq(4)

spec/models/agents/adioso_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::AdiosoAgent do
 	before do

spec/models/agents/basecamp_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'models/concerns/oauthable'
 
 describe Agents::BasecampAgent do

spec/models/agents/change_detector_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::ChangeDetectorAgent do
   def create_event(output=nil)

spec/models/agents/commander_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::CommanderAgent do
   let(:valid_params) {

spec/models/agents/data_output_agent_spec.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::DataOutputAgent do
   let(:agent) do

spec/models/agents/de_duplication_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::DeDuplicationAgent do
   def create_event(output=nil)

spec/models/agents/delay_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::DelayAgent do
   let(:agent) do

spec/models/agents/dropbox_file_url_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::DropboxFileUrlAgent do
   before(:each) do

spec/models/agents/dropbox_watch_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::DropboxWatchAgent do
   before(:each) do

spec/models/agents/email_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::EmailAgent do
   it_behaves_like EmailConcern

spec/models/agents/email_digest_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::EmailDigestAgent do
   it_behaves_like EmailConcern

spec/models/agents/event_formatting_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::EventFormattingAgent do
   before do

spec/models/agents/evernote_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::EvernoteAgent do
   class FakeEvernoteNoteStore

spec/models/agents/ftpsite_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'time'
 
 describe Agents::FtpsiteAgent do
@@ -26,7 +26,7 @@ describe Agents::FtpsiteAgent do
 
       it "should validate the integer fields" do
         @checker.options['expected_update_period_in_days'] = "nonsense"
-        expect { @checker.save! }.to raise_error;
+        expect { @checker.save! }.to raise_error(/Invalid expected_update_period_in_days format/);
         @checker.options = @site
       end
 

spec/models/agents/gap_detector_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::GapDetectorAgent do
   let(:valid_params) {

spec/models/agents/google_calendar_publish_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::GoogleCalendarPublishAgent, :vcr do
   before do

spec/models/agents/growl_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::GrowlAgent do
   before do

spec/models/agents/hipchat_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::HipchatAgent do
   before(:each) do

spec/models/agents/human_task_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::HumanTaskAgent do
   before do

spec/models/agents/imap_folder_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'time'
 
 describe Agents::ImapFolderAgent do

spec/models/agents/jabber_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::JabberAgent do
   let(:sent) { [] }

spec/models/agents/java_script_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::JavaScriptAgent do
   before do

spec/models/agents/jira_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::JiraAgent do
   before(:each) do

spec/models/agents/mqtt_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'mqtt'
 require './spec/support/fake_mqtt_server'
 

spec/models/agents/pdf_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::PdfInfoAgent do
   let(:agent) do

spec/models/agents/peak_detector_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::PeakDetectorAgent do
   before do

spec/models/agents/post_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'ostruct'
 
 describe Agents::PostAgent do

spec/models/agents/public_transport_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 describe Agents::PublicTransportAgent do
   before do
     valid_params = {

spec/models/agents/pushbullet_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::PushbulletAgent do
   before(:each) do

spec/models/agents/pushover_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::PushoverAgent do
   before do

spec/models/agents/rss_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::RssAgent do
   before do

spec/models/agents/scheduler_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::SchedulerAgent do
   let(:valid_params) {

spec/models/agents/sentiment_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::SentimentAgent do
     before do

spec/models/agents/shell_command_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::ShellCommandAgent do
   before do

spec/models/agents/slack_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::SlackAgent do
   before(:each) do

spec/models/agents/stubhub_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::StubhubAgent do
 

spec/models/agents/translation_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::TranslationAgent do
     before do

spec/models/agents/trigger_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::TriggerAgent do
   before do

spec/models/agents/tumblr_publish_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::TumblrPublishAgent do
   before do

spec/models/agents/twilio_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::TwilioAgent do
   before do

spec/models/agents/twitter_publish_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::TwitterPublishAgent do
   before do

spec/models/agents/twitter_search_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::TwitterSearchAgent do
   before do

spec/models/agents/twitter_stream_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::TwitterStreamAgent do
   before do

spec/models/agents/twitter_user_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::TwitterUserAgent do
   before do

spec/models/agents/user_location_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::UserLocationAgent do
   before do

spec/models/agents/weather_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::WeatherAgent do
   let(:agent) do

spec/models/agents/webhook_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::WebhookAgent do
   let(:agent) do

spec/models/agents/website_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::WebsiteAgent do
   describe "checking without basic auth" do

spec/models/agents/weibo_publish_agent_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8 
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::WeiboPublishAgent do
   before do

spec/models/agents/weibo_user_agent_spec.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8 
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::WeiboUserAgent do
   before do

spec/models/agents/witai_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Agents::WitaiAgent do
   before do

spec/models/agents/wunderlist_agent_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 require 'models/concerns/oauthable'
 
 describe Agents::WunderlistAgent do

spec/models/concerns/oauthable.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 module Agents
   class OauthableTestAgent < Agent

spec/models/event_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Event do
   describe ".with_location" do

spec/models/scenario_import_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe ScenarioImport do
   let(:user) { users(:bob) }

spec/models/scenario_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Scenario do
   let(:new_instance) { users(:bob).scenarios.build(:name => "some scenario") }

spec/models/service_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe Service do
   before(:each) do

spec/models/user_credential_spec.rb

@@ -1,19 +1,19 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe UserCredential do
   describe "validation" do
-    it { is_expected.to validate_uniqueness_of(:credential_name).scoped_to(:user_id) }
-    it { is_expected.to validate_presence_of(:credential_name) }
-    it { is_expected.to validate_presence_of(:credential_value) }
-    it { is_expected.to validate_presence_of(:user_id) }
+    it { should validate_uniqueness_of(:credential_name).scoped_to(:user_id) }
+    it { should validate_presence_of(:credential_name) }
+    it { should validate_presence_of(:credential_value) }
+    it { should validate_presence_of(:user_id) }
   end
 
   describe "mass assignment" do
-    it { is_expected.to allow_mass_assignment_of :credential_name }
+    it { should allow_mass_assignment_of :credential_name }
 
-    it { is_expected.to allow_mass_assignment_of :credential_value }
+    it { should allow_mass_assignment_of :credential_value }
 
-    it { is_expected.not_to allow_mass_assignment_of :user_id }
+    it { should_not allow_mass_assignment_of :user_id }
   end
 
   describe "cleaning fields" do

spec/models/users_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe User do
   describe "validations" do
@@ -10,13 +10,13 @@ describe User do
         
         it "only accepts valid invitation codes" do
           User::INVITATION_CODES.each do |v|
-            is_expected.to allow_value(v).for(:invitation_code)
+            should allow_value(v).for(:invitation_code)
           end
         end
   
         it "can reject invalid invitation codes" do
           %w['foo', 'bar'].each do |v|
-            is_expected.not_to allow_value(v).for(:invitation_code)
+            should_not allow_value(v).for(:invitation_code)
           end
         end
       end
@@ -28,7 +28,7 @@ describe User do
         
         it "skips this validation" do
           %w['foo', 'bar', nil, ''].each do |v|
-            is_expected.to allow_value(v).for(:invitation_code)
+            should allow_value(v).for(:invitation_code)
           end
         end
       end

spec/presenters/form_configurable_agent_presenter_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe FormConfigurableAgentPresenter do
   include RSpecHtmlMatchers

spec/spec_helper.rb → spec/rails_helper.rb

@@ -21,11 +21,13 @@ Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
 
 ActiveRecord::Migration.maintain_test_schema!
 
-# TODO: This will silence warnings when the raise_error matcher
-# is used without providing a specific error or error message.
-# Specs SHOULD pass the type of error that you're expecting to be
-# raised when using the raise_error matcher.
-RSpec::Expectations.configuration.warn_about_potential_false_positives = false
+# Mix in shoulda matchers
+Shoulda::Matchers.configure do |config|
+  config.integrate do |with|
+    with.test_framework :rspec
+    with.library :rails
+  end
+end
 
 RSpec.configure do |config|
   config.mock_with :rr

spec/routing/webhooks_controller_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 describe "routing for web requests", :type => :routing do
   it "routes to handle_request" do

spec/support/shared_examples/agent_controller_concern.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 shared_examples_for AgentControllerConcern do
   describe "preconditions" do

spec/support/shared_examples/email_concern.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 shared_examples_for EmailConcern do
   let(:valid_options) {

spec/support/shared_examples/has_guid.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 shared_examples_for HasGuid do
   it "gets created before_save, but only if it's not present" do

spec/support/shared_examples/liquid_interpolatable.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 shared_examples_for LiquidInterpolatable do
   before(:each) do
@@ -94,7 +94,7 @@ shared_examples_for LiquidInterpolatable do
       it "should raise an exception for undefined credentials" do
         expect {
           @checker.interpolate_string("{% credential unknown %}", {})
-        }.to raise_error
+        }.to raise_error(/No user credential named/)
       end
     end
 

spec/support/shared_examples/web_request_concern.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 shared_examples_for WebRequestConcern do
   let(:agent) do