diff options
author | Valery Sizov <valery@gitlab.com> | 2015-04-27 14:10:18 +0000 |
---|---|---|
committer | Valery Sizov <valery@gitlab.com> | 2015-04-27 14:10:18 +0000 |
commit | d3abf125f3ac74641c9a5e62390a08e6cd786fa9 (patch) | |
tree | 1bfd63f3e0dc05b3a1b49edb3362e722528c8c77 | |
parent | 6d811a64636b21112399d2eb831769efa42789eb (diff) | |
parent | aa0a36a25d861683b2ae3585c5b7452545c85963 (diff) | |
download | gitlab-ci-d3abf125f3ac74641c9a5e62390a08e6cd786fa9.tar.gz |
Merge branch 'query_string_in_nwtwork' into 'master'
Make Network class to follow HTTP RFC
https://gitlab.com/gitlab-org/gitlab-ci/issues/144
See merge request !86
-rw-r--r-- | app/models/network.rb | 2 | ||||
-rw-r--r-- | spec/requests/api/forks_spec.rb | 8 | ||||
-rw-r--r-- | spec/requests/api/projects_spec.rb | 8 | ||||
-rw-r--r-- | spec/requests/api/runners_spec.rb | 9 | ||||
-rw-r--r-- | spec/support/stub_gitlab_calls.rb | 2 |
5 files changed, 5 insertions, 24 deletions
diff --git a/app/models/network.rb b/app/models/network.rb index 72eaeed..8431f75 100644 --- a/app/models/network.rb +++ b/app/models/network.rb @@ -7,7 +7,7 @@ class Network def authenticate(api_opts) opts = { - body: api_opts.to_json + query: api_opts } endpoint = File.join(url, API_PREFIX, 'user') diff --git a/spec/requests/api/forks_spec.rb b/spec/requests/api/forks_spec.rb index 3eacb98..8de1006 100644 --- a/spec/requests/api/forks_spec.rb +++ b/spec/requests/api/forks_spec.rb @@ -5,13 +5,7 @@ describe API::API do let(:project) { FactoryGirl.create(:project) } let(:gitlab_url) { GitlabCi.config.gitlab_server.url } - let(:auth_opts) { - { - email: "test@test.com", - password: "123456" - } - } - let(:private_token) { Network.new.authenticate(auth_opts)["private_token"] } + let(:private_token) { Network.new.authenticate(access_token: "some_token")["private_token"] } let(:options) { { diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb index e56d4bc..028fe94 100644 --- a/spec/requests/api/projects_spec.rb +++ b/spec/requests/api/projects_spec.rb @@ -4,13 +4,7 @@ describe API::API do include ApiHelpers let(:gitlab_url) { GitlabCi.config.gitlab_server.url } - let(:auth_opts) { - { - email: "test@test.com", - password: "123456" - } - } - let(:private_token) { Network.new.authenticate(auth_opts)["private_token"] } + let(:private_token) { Network.new.authenticate(access_token: "some_token")["private_token"] } let(:options) { { diff --git a/spec/requests/api/runners_spec.rb b/spec/requests/api/runners_spec.rb index 336601a..47de3c2 100644 --- a/spec/requests/api/runners_spec.rb +++ b/spec/requests/api/runners_spec.rb @@ -10,14 +10,7 @@ describe API::API do describe "GET /runners" do let(:gitlab_url) { GitlabCi.config.gitlab_server.url } - let(:auth_opts) { - { - :email => "test@test.com", - :password => "123456" - } - } - - let(:private_token) { Network.new.authenticate(auth_opts)["private_token"] } + let(:private_token) { Network.new.authenticate(access_token: "some_token")["private_token"] } let(:options) { { :private_token => private_token, diff --git a/spec/support/stub_gitlab_calls.rb b/spec/support/stub_gitlab_calls.rb index 3058d03..286c6c9 100644 --- a/spec/support/stub_gitlab_calls.rb +++ b/spec/support/stub_gitlab_calls.rb @@ -40,7 +40,7 @@ module StubGitlabCalls def stub_oauth_user f = File.read(Rails.root.join('spec/support/gitlab_stubs/user.json')) - stub_request(:get, "#{gitlab_url}api/v3/user"). + stub_request(:get, "#{gitlab_url}api/v3/user?access_token=some_token"). with(:headers => {'Content-Type'=>'application/json'}). to_return(:status => 200, :body => f, :headers => {'Content-Type'=>'application/json'}) end |