diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-03-02 16:22:50 +0000 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-03-02 16:22:50 +0000 |
| commit | ba9bb4f59f0a8095350c433a303dc46c24bc34b1 (patch) | |
| tree | f0206afc57f7a835d0bb75fdc54a8b8129735bbb /spec/services | |
| parent | 1fbc4886684b904f2de9e5f726f9e8c0baa76352 (diff) | |
| parent | b8ca9bc43a9504dad94a66630170ab6311eb5c09 (diff) | |
| download | gitlab-ce-ba9bb4f59f0a8095350c433a303dc46c24bc34b1.tar.gz | |
Merge branch 'master' into 'zj-create-mattermost-team'
# Conflicts:
# app/assets/javascripts/dispatcher.js.es6
Diffstat (limited to 'spec/services')
| -rw-r--r-- | spec/services/ci/image_for_build_service_spec.rb | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/spec/services/ci/image_for_build_service_spec.rb b/spec/services/ci/image_for_build_service_spec.rb deleted file mode 100644 index b3e0a7b9b58..00000000000 --- a/spec/services/ci/image_for_build_service_spec.rb +++ /dev/null @@ -1,50 +0,0 @@ -require 'spec_helper' - -module Ci - describe ImageForBuildService, services: true do - let(:service) { ImageForBuildService.new } - let(:project) { FactoryGirl.create(:empty_project) } - let(:commit_sha) { '01234567890123456789' } - let(:pipeline) { project.ensure_pipeline('master', commit_sha) } - let(:build) { FactoryGirl.create(:ci_build, pipeline: pipeline) } - - 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') } - - it { expect(image).to be_kind_of(OpenStruct) } - it { expect(image.path.to_s).to include('public/ci/build-running.svg') } - it { expect(image.name).to eq('build-running.svg') } - end - - context 'unknown branch name' do - let(:image) { service.execute(project, ref: 'feature') } - - it { expect(image).to be_kind_of(OpenStruct) } - it { expect(image.path.to_s).to include('public/ci/build-unknown.svg') } - it { expect(image.name).to eq('build-unknown.svg') } - end - - context 'commit sha' do - before { build.run! } - let(:image) { service.execute(project, sha: build.sha) } - - it { expect(image).to be_kind_of(OpenStruct) } - it { expect(image.path.to_s).to include('public/ci/build-running.svg') } - it { expect(image.name).to eq('build-running.svg') } - end - - context 'unknown commit sha' do - let(:image) { service.execute(project, sha: '0000000') } - - it { expect(image).to be_kind_of(OpenStruct) } - it { expect(image.path.to_s).to include('public/ci/build-unknown.svg') } - it { expect(image.name).to eq('build-unknown.svg') } - end - end - end -end |