diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-12 09:08:25 -0800 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-01-12 09:08:25 -0800 |
commit | bba8e59a044f34a02000b752a70198fb74236b1d (patch) | |
tree | f53504aca367b4b02c6faa4ce3e633a3dfea2899 | |
parent | 4e7df0037a45f4d2b05ef1a582cb1bbef44afd10 (diff) | |
download | gitlab-ce-bba8e59a044f34a02000b752a70198fb74236b1d.tar.gz |
Fix test hook and tests
-rw-r--r-- | app/controllers/projects/services_controller.rb | 2 | ||||
-rw-r--r-- | app/services/test_hook_service.rb | 2 | ||||
-rw-r--r-- | spec/models/assembla_service_spec.rb | 2 | ||||
-rw-r--r-- | spec/models/flowdock_service_spec.rb | 2 | ||||
-rw-r--r-- | spec/models/gemnasium_service_spec.rb | 2 | ||||
-rw-r--r-- | spec/models/pushover_service_spec.rb | 2 | ||||
-rw-r--r-- | spec/models/slack_service_spec.rb | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/app/controllers/projects/services_controller.rb b/app/controllers/projects/services_controller.rb index 9c203debc3f..b2ce99aeb45 100644 --- a/app/controllers/projects/services_controller.rb +++ b/app/controllers/projects/services_controller.rb @@ -24,7 +24,7 @@ class Projects::ServicesController < Projects::ApplicationController end def test - data = Gitlab::PushDataBuilder.build(project, current_user) + data = Gitlab::PushDataBuilder.build_sample(project, current_user) @service.execute(data) redirect_to :back diff --git a/app/services/test_hook_service.rb b/app/services/test_hook_service.rb index 3c03aeaaf66..21ec2c01cb8 100644 --- a/app/services/test_hook_service.rb +++ b/app/services/test_hook_service.rb @@ -1,6 +1,6 @@ class TestHookService def execute(hook, current_user) - data = Gitlab::PushDataBuilder.build(hook.project, current_user) + data = Gitlab::PushDataBuilder.build_sample(hook.project, current_user) hook.execute(data) end end diff --git a/spec/models/assembla_service_spec.rb b/spec/models/assembla_service_spec.rb index 4300090eb13..005dd41fea9 100644 --- a/spec/models/assembla_service_spec.rb +++ b/spec/models/assembla_service_spec.rb @@ -33,7 +33,7 @@ describe AssemblaService, models: true do token: 'verySecret', subdomain: 'project_name' ) - @sample_data = GitPushService.new.sample_data(project, user) + @sample_data = Gitlab::PushDataBuilder.build_sample(project, user) @api_url = 'https://atlas.assembla.com/spaces/project_name/github_tool?secret_key=verySecret' WebMock.stub_request(:post, @api_url) end diff --git a/spec/models/flowdock_service_spec.rb b/spec/models/flowdock_service_spec.rb index 5540f0fa988..ac156719b43 100644 --- a/spec/models/flowdock_service_spec.rb +++ b/spec/models/flowdock_service_spec.rb @@ -32,7 +32,7 @@ describe FlowdockService do service_hook: true, token: 'verySecret' ) - @sample_data = GitPushService.new.sample_data(project, user) + @sample_data = Gitlab::PushDataBuilder.build_sample(project, user) @api_url = 'https://api.flowdock.com/v1/git/verySecret' WebMock.stub_request(:post, @api_url) end diff --git a/spec/models/gemnasium_service_spec.rb b/spec/models/gemnasium_service_spec.rb index 60ffa6f8b05..2c560c11dac 100644 --- a/spec/models/gemnasium_service_spec.rb +++ b/spec/models/gemnasium_service_spec.rb @@ -33,7 +33,7 @@ describe GemnasiumService do token: 'verySecret', api_key: 'GemnasiumUserApiKey' ) - @sample_data = GitPushService.new.sample_data(project, user) + @sample_data = Gitlab::PushDataBuilder.build_sample(project, user) end it "should call Gemnasium service" do Gemnasium::GitlabService.should_receive(:execute).with(an_instance_of(Hash)).once diff --git a/spec/models/pushover_service_spec.rb b/spec/models/pushover_service_spec.rb index 59db69d7572..f2813d66c7d 100644 --- a/spec/models/pushover_service_spec.rb +++ b/spec/models/pushover_service_spec.rb @@ -36,7 +36,7 @@ describe PushoverService do let(:pushover) { PushoverService.new } let(:user) { create(:user) } let(:project) { create(:project) } - let(:sample_data) { GitPushService.new.sample_data(project, user) } + let(:sample_data) { Gitlab::PushDataBuilder.build_sample(project, user) } let(:api_key) { 'verySecret' } let(:user_key) { 'verySecret' } diff --git a/spec/models/slack_service_spec.rb b/spec/models/slack_service_spec.rb index d4840391967..34594072409 100644 --- a/spec/models/slack_service_spec.rb +++ b/spec/models/slack_service_spec.rb @@ -34,7 +34,7 @@ describe SlackService do let(:slack) { SlackService.new } let(:user) { create(:user) } let(:project) { create(:project) } - let(:sample_data) { GitPushService.new.sample_data(project, user) } + let(:sample_data) { Gitlab::PushDataBuilder.build_sample(project, user) } let(:webhook_url) { 'https://hooks.slack.com/services/SVRWFV0VVAR97N/B02R25XN3/ZBqu7xMupaEEICInN685' } before do |