From ada2be3c215987b4f83dc579059bf276d1155f89 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Fri, 5 Jun 2015 15:24:36 +0200
Subject: [PATCH] Fix spinach tests and some specs after merge CE into EE

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
---
 features/steps/group_hooks.rb    |  2 +-
 spec/lib/gitlab/upgrader_spec.rb | 24 ++++++++++++------------
 spec/support/login_helpers.rb    |  4 +++-
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/features/steps/group_hooks.rb b/features/steps/group_hooks.rb
index ce0d6ce504..789846040a 100644
--- a/features/steps/group_hooks.rb
+++ b/features/steps/group_hooks.rb
@@ -32,7 +32,7 @@ class Spinach::Features::GroupHooks < Spinach::FeatureSteps
   end
 
   step 'I submit new hook' do
-    @url = Faker::Internet.uri("http")
+    @url = FFaker::Internet.uri("http")
     fill_in "hook_url", with: @url
     expect { click_button "Add Web Hook" }.to change(GroupHook, :count).by(1)
   end
diff --git a/spec/lib/gitlab/upgrader_spec.rb b/spec/lib/gitlab/upgrader_spec.rb
index 7bf30d2935..f4d122d236 100644
--- a/spec/lib/gitlab/upgrader_spec.rb
+++ b/spec/lib/gitlab/upgrader_spec.rb
@@ -17,22 +17,22 @@ describe Gitlab::Upgrader do
 
   describe 'latest_version_raw' do
     it 'should be latest version for GitLab 5' do
-      upgrader.stub(current_version_raw: "6.3.0-ee")
-      expect(upgrader.latest_version_raw).to match(/v6\.\d\.\d-ee/)
+      upgrader.stub(current_version_raw: "7.11.0-ee")
+      expect(upgrader.latest_version_raw).to match(/v7\.\d\.\d-ee/)
     end
 
     it 'should get the latest version from tags' do
       allow(upgrader).to receive(:fetch_git_tags).and_return([
-        '6f0733310546402c15d3ae6128a95052f6c8ea96  refs/tags/v7.1.1',
-        'facfec4b242ce151af224e20715d58e628aa5e74  refs/tags/v7.1.1^{}',
-        'f7068d99c79cf79befbd388030c051bb4b5e86d4  refs/tags/v7.10.4',
-        '337225a4fcfa9674e2528cb6d41c46556bba9dfa  refs/tags/v7.10.4^{}',
-        '880e0ba0adbed95d087f61a9a17515e518fc6440  refs/tags/v7.11.1',
-        '6584346b604f981f00af8011cd95472b2776d912  refs/tags/v7.11.1^{}',
-        '43af3e65a486a9237f29f56d96c3b3da59c24ae0  refs/tags/v7.11.2',
-        'dac18e7728013a77410e926a1e64225703754a2d  refs/tags/v7.11.2^{}',
-        '0bf21fd4b46c980c26fd8c90a14b86a4d90cc950  refs/tags/v7.9.4',
-        'b10de29edbaff7219547dc506cb1468ee35065c3  refs/tags/v7.9.4^{}'])
+        '6f0733310546402c15d3ae6128a95052f6c8ea96  refs/tags/v7.1.1-ee',
+        'facfec4b242ce151af224e20715d58e628aa5e74  refs/tags/v7.1.1-ee^{}',
+        'f7068d99c79cf79befbd388030c051bb4b5e86d4  refs/tags/v7.10.4-ee',
+        '337225a4fcfa9674e2528cb6d41c46556bba9dfa  refs/tags/v7.10.4-ee^{}',
+        '880e0ba0adbed95d087f61a9a17515e518fc6440  refs/tags/v7.11.1-ee',
+        '6584346b604f981f00af8011cd95472b2776d912  refs/tags/v7.11.1-ee^{}',
+        '43af3e65a486a9237f29f56d96c3b3da59c24ae0  refs/tags/v7.11.2-ee',
+        'dac18e7728013a77410e926a1e64225703754a2d  refs/tags/v7.11.2-ee^{}',
+        '0bf21fd4b46c980c26fd8c90a14b86a4d90cc950  refs/tags/v7.9.4-ee',
+        'b10de29edbaff7219547dc506cb1468ee35065c3  refs/tags/v7.9.4-ee^{}'])
       expect(upgrader.latest_version_raw).to eq("v7.11.2")
     end
   end
diff --git a/spec/support/login_helpers.rb b/spec/support/login_helpers.rb
index 791d2a1fd6..ba02ae087e 100644
--- a/spec/support/login_helpers.rb
+++ b/spec/support/login_helpers.rb
@@ -21,6 +21,8 @@ module LoginHelpers
 
   # Requires Javascript driver.
   def logout
-    find(:css, ".fa.fa-sign-out").click
+    within '.logout-holder' do
+      find(:css, ".fa.fa-sign-out").click
+    end
   end
 end