diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2018-01-30 14:50:17 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2018-01-30 14:50:17 +0000 |
| commit | 07557a946bac1b596a28293d39e7bd2581ff828b (patch) | |
| tree | f725f935880b122862880f9f18d18fb74a7f758b /spec/models/ci/build_spec.rb | |
| parent | bf01452cc361842dab7442a9ad868213d53bd212 (diff) | |
| parent | 03f386c2b20f95272e4846f5ecab54fd8b2566e0 (diff) | |
| download | gitlab-ce-qa-define-selectors.tar.gz | |
Merge branch 'master' into 'qa-define-selectors'qa-define-selectors
# Conflicts:
# qa/qa/page/group/show.rb
Diffstat (limited to 'spec/models/ci/build_spec.rb')
| -rw-r--r-- | spec/models/ci/build_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb index 45a606c1ea8..f5b3b4a9fc5 100644 --- a/spec/models/ci/build_spec.rb +++ b/spec/models/ci/build_spec.rb @@ -277,7 +277,7 @@ describe Ci::Build do allow_any_instance_of(Project).to receive(:jobs_cache_index).and_return(1) end - it { is_expected.to be_an(Array).and all(include(key: "key:1")) } + it { is_expected.to be_an(Array).and all(include(key: "key_1")) } end context 'when project does not have jobs_cache_index' do |