diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-12-14 15:18:46 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-12-14 15:18:46 +0000 |
commit | 4bdfb0391a578847fde5589eb44ac6737c9e4b64 (patch) | |
tree | 4af12a6ef4f7ead85c2d80a48687f42c492564fa /spec/lib/gitlab/ci/status/skipped_spec.rb | |
parent | 161d7c02d4ff49d6d91b982faee61b5de00d2631 (diff) | |
parent | b70b962892b2428557d95a9639fbcead4fe546fd (diff) | |
download | gitlab-ce-4bdfb0391a578847fde5589eb44ac6737c9e4b64.tar.gz |
Merge branch 'master' into 'dz-remove-namespaces-path-uniq'
Merge Request - https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/8013
# Conflicts:
# db/schema.rb
Diffstat (limited to 'spec/lib/gitlab/ci/status/skipped_spec.rb')
-rw-r--r-- | spec/lib/gitlab/ci/status/skipped_spec.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/spec/lib/gitlab/ci/status/skipped_spec.rb b/spec/lib/gitlab/ci/status/skipped_spec.rb index d4f7f4b3b70..94601648a8d 100644 --- a/spec/lib/gitlab/ci/status/skipped_spec.rb +++ b/spec/lib/gitlab/ci/status/skipped_spec.rb @@ -1,7 +1,9 @@ require 'spec_helper' describe Gitlab::Ci::Status::Skipped do - subject { described_class.new(double('subject')) } + subject do + described_class.new(double('subject'), double('user')) + end describe '#text' do it { expect(subject.label).to eq 'skipped' } @@ -14,8 +16,4 @@ describe Gitlab::Ci::Status::Skipped do describe '#icon' do it { expect(subject.icon).to eq 'icon_status_skipped' } end - - describe '#title' do - it { expect(subject.title).to eq 'Double: skipped' } - end end |