Merge branch 'oauth' into 'master'

Oauth2

See merge request !104

3 files changed, 18 insertions, 5 deletions

diff --git a/spec/support/login_helpers.rb b/spec/support/login_helpers.rb
index 1f810d3..ebd9693 100644
--- a/spec/support/login_helpers.rb
+++ b/spec/support/login_helpers.rb
@@ -9,10 +9,7 @@ module LoginHelpers
   #
   # user - User instance to login with
   def login_with(user)
-    visit new_user_sessions_path
-    fill_in "user_session_email", with: 'test@test.com'
-    fill_in "user_session_password", with: "123456"
-    click_button "Sign in"
+    visit callback_user_sessions_path(code: "some_auth_code_here")
   end
 
   def logout
diff --git a/spec/support/monkey_patches/oauth2.rb b/spec/support/monkey_patches/oauth2.rb
new file mode 100644
index 0000000..dfd5e31
--- /dev/null
+++ b/spec/support/monkey_patches/oauth2.rb
@@ -0,0 +1,7 @@
+module OAuth2
+  class Client
+    def get_token(params, access_token_opts = {}, access_token_class = AccessToken)
+      OpenStruct.new(token: "some_token")
+    end
+  end
+end
\ No newline at end of file
diff --git a/spec/support/stub_gitlab_calls.rb b/spec/support/stub_gitlab_calls.rb
index a0624ab..6c047ec 100644
--- a/spec/support/stub_gitlab_calls.rb
+++ b/spec/support/stub_gitlab_calls.rb
@@ -2,6 +2,7 @@ module StubGitlabCalls
   def stub_gitlab_calls
     stub_session
     stub_user
+    stub_oauth_user
     stub_project_8
     stub_project_8_hooks
     stub_projects
@@ -15,7 +16,7 @@ module StubGitlabCalls
   private
 
   def gitlab_url
-    GitlabCi.config.gitlab_server_urls.first
+    GitlabCi.config.gitlab_server.url
   end
 
   def stub_session
@@ -35,6 +36,14 @@ module StubGitlabCalls
       to_return(:status => 200, :body => f, :headers => {'Content-Type'=>'application/json'})
   end
 
+  def stub_oauth_user
+    f = File.read(Rails.root.join('spec/support/gitlab_stubs/user.json'))
+
+    stub_request(:get, "#{gitlab_url}api/v3/user").
+      with(:headers => {'Content-Type'=>'application/json'}).
+      to_return(:status => 200, :body => f, :headers => {'Content-Type'=>'application/json'})
+  end
+
   def stub_project_8
     f = File.read(Rails.root.join('spec/support/gitlab_stubs/project_8.json'))