diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-24 09:53:04 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-09-24 09:53:04 +0000 |
| commit | fd39414408208f07b22a48006aa523c326332725 (patch) | |
| tree | 264a46100236503a25528f4323b4203edecbb5e8 /spec | |
| parent | 081a0ddce7f8608df23cb6649263a2aa0e805c08 (diff) | |
| parent | a42f418f183a350a5a3d5eebc5223e5639e16981 (diff) | |
| download | gitlab-ce-fd39414408208f07b22a48006aa523c326332725.tar.gz | |
Merge branch 'remove-routes-helper' into 'master'
Fix Slack notification URL and remove the usage of Ci::RoutesHelper
Fix for #2644
/cc @dzaporozhets @rspeicher
See merge request !1391
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/models/project_services/gitlab_ci_service_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/project_services/gitlab_ci_service_spec.rb b/spec/models/project_services/gitlab_ci_service_spec.rb index e0da04a3f40..8cdd551a0ca 100644 --- a/spec/models/project_services/gitlab_ci_service_spec.rb +++ b/spec/models/project_services/gitlab_ci_service_spec.rb @@ -39,8 +39,8 @@ describe GitlabCiService do end describe :build_page do - it { expect(@service.build_page("2ab7834c", 'master')).to eq("/ci/projects/#{@ci_project.id}/refs/master/commits/2ab7834c")} - it { expect(@service.build_page("issue#2", 'master')).to eq("/ci/projects/#{@ci_project.id}/refs/master/commits/issue%232")} + it { expect(@service.build_page("2ab7834c", 'master')).to eq("http://localhost/ci/projects/#{@ci_project.id}/refs/master/commits/2ab7834c")} + it { expect(@service.build_page("issue#2", 'master')).to eq("http://localhost/ci/projects/#{@ci_project.id}/refs/master/commits/issue%232")} end describe "execute" do |