From db03dc318e41f93887f668969dd207268a3168dc Mon Sep 17 00:00:00 2001 From: Valery Sizov Date: Tue, 21 Apr 2015 18:56:10 +0300 Subject: refactoring network related code --- spec/controllers/projects_controller_spec.rb | 2 +- spec/models/network_spec.rb | 4 ++-- spec/requests/api/forks_spec.rb | 2 +- spec/requests/api/projects_spec.rb | 2 +- spec/requests/api/runners_spec.rb | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'spec') diff --git a/spec/controllers/projects_controller_spec.rb b/spec/controllers/projects_controller_spec.rb index dea35f6..cea3986 100644 --- a/spec/controllers/projects_controller_spec.rb +++ b/spec/controllers/projects_controller_spec.rb @@ -82,7 +82,7 @@ describe ProjectsController do it "searches projects" do allow(controller).to receive(:reset_cache) { true } allow(controller).to receive(:current_user) { user } - Network.any_instance.should_receive(:projects).with(anything(), hash_including(search: 'str'), :authorized) + Network.any_instance.should_receive(:projects).with(hash_including(search: 'str'), :authorized) xhr :get, :gitlab, { search: "str", format: "js" }.with_indifferent_access diff --git a/spec/models/network_spec.rb b/spec/models/network_spec.rb index c0e92e2..b80adba 100644 --- a/spec/models/network_spec.rb +++ b/spec/models/network_spec.rb @@ -4,7 +4,7 @@ describe Network do let(:network) { Network.new } describe :enable_ci do - subject { network.enable_ci '', '', '', '' } + subject { network.enable_ci '', '', '' } context 'on success' do before do @@ -29,7 +29,7 @@ describe Network do describe :disable_ci do let(:response) { double } - subject { network.disable_ci '', '', '' } + subject { network.disable_ci '', '' } context 'on success' do let(:parsed_response) { 'parsed' } diff --git a/spec/requests/api/forks_spec.rb b/spec/requests/api/forks_spec.rb index e0469db..3eacb98 100644 --- a/spec/requests/api/forks_spec.rb +++ b/spec/requests/api/forks_spec.rb @@ -11,7 +11,7 @@ describe API::API do password: "123456" } } - let(:private_token) { Network.new.authenticate(gitlab_url, auth_opts)["private_token"] } + let(:private_token) { Network.new.authenticate(auth_opts)["private_token"] } let(:options) { { diff --git a/spec/requests/api/projects_spec.rb b/spec/requests/api/projects_spec.rb index cf0831b..e56d4bc 100644 --- a/spec/requests/api/projects_spec.rb +++ b/spec/requests/api/projects_spec.rb @@ -10,7 +10,7 @@ describe API::API do password: "123456" } } - let(:private_token) { Network.new.authenticate(gitlab_url, auth_opts)["private_token"] } + let(:private_token) { Network.new.authenticate(auth_opts)["private_token"] } let(:options) { { diff --git a/spec/requests/api/runners_spec.rb b/spec/requests/api/runners_spec.rb index 477b66f..336601a 100644 --- a/spec/requests/api/runners_spec.rb +++ b/spec/requests/api/runners_spec.rb @@ -17,7 +17,7 @@ describe API::API do } } - let(:private_token) { Network.new.authenticate(gitlab_url, auth_opts)["private_token"] } + let(:private_token) { Network.new.authenticate(auth_opts)["private_token"] } let(:options) { { :private_token => private_token, -- cgit v1.2.1