Merge pull request #8785 from jvanbaarsen/rspec-upgrade

Rspec upgrade

2 files changed, 2 insertions, 2 deletions

diff --git a/features/steps/project/redirects.rb b/features/steps/project/redirects.rb
index e54637120ce..e2badccbcf4 100644
--- a/features/steps/project/redirects.rb
+++ b/features/steps/project/redirects.rb
@@ -17,7 +17,7 @@ class Spinach::Features::ProjectRedirects < Spinach::FeatureSteps
   end
 
   step 'I should see project "Community" home page' do
-    Gitlab.config.gitlab.stub(:host).and_return("www.example.com")
+    Gitlab.config.gitlab.should_receive(:host).and_return("www.example.com")
     within '.navbar-gitlab .title' do
       page.should have_content 'Community'
     end
diff --git a/features/support/env.rb b/features/support/env.rb
index 67660777842..be17065ccfd 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -47,8 +47,8 @@ Spinach.hooks.after_scenario do
 end
 
 Spinach.hooks.before_run do
+  include RSpec::Mocks::ExampleMethods
   TestEnv.init(mailer: false)
-  RSpec::Mocks::setup self
 
   include FactoryGirl::Syntax::Methods
 end