diff options
author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2015-12-15 16:24:14 +0100 |
---|---|---|
committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2015-12-15 16:24:14 +0100 |
commit | d27befe64dd0d55bec2472ef641c4733cc669215 (patch) | |
tree | 623db3d658408b42d8b25e923eb9ccf68016d9fa /spec/services/ci/image_for_build_service_spec.rb | |
parent | 447e598ec4ee0d2fae29303d4359ffe6a06d3ba5 (diff) | |
parent | 4493d3fd556af6ded47f940f258b0fc26c9eb3e8 (diff) | |
download | gitlab-ce-d27befe64dd0d55bec2472ef641c4733cc669215.tar.gz |
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into workhorse-passthrough
Diffstat (limited to 'spec/services/ci/image_for_build_service_spec.rb')
-rw-r--r-- | spec/services/ci/image_for_build_service_spec.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/services/ci/image_for_build_service_spec.rb b/spec/services/ci/image_for_build_service_spec.rb index b43cabb4ee4..870861ad20a 100644 --- a/spec/services/ci/image_for_build_service_spec.rb +++ b/spec/services/ci/image_for_build_service_spec.rb @@ -3,16 +3,16 @@ require 'spec_helper' module Ci describe ImageForBuildService, services: true do let(:service) { ImageForBuildService.new } - let(:project) { FactoryGirl.create(:ci_project) } - let(:gl_project) { FactoryGirl.create(:project, gitlab_ci_project: project) } - let(:commit_sha) { gl_project.commit('master').sha } - let(:commit) { gl_project.ensure_ci_commit(commit_sha) } + let(:project) { FactoryGirl.create(:empty_project) } + let(:commit_sha) { '01234567890123456789' } + let(:commit) { project.ensure_ci_commit(commit_sha) } let(:build) { FactoryGirl.create(:ci_build, commit: commit) } describe :execute do before { build } context 'branch name' do + before { allow(project).to receive(:commit).and_return(OpenStruct.new(sha: commit_sha)) } before { build.run! } let(:image) { service.execute(project, ref: 'master') } |