diff options
author | Dylan Griffith <dyl.griffith@gmail.com> | 2018-05-11 12:55:15 +0300 |
---|---|---|
committer | Dylan Griffith <dyl.griffith@gmail.com> | 2018-05-11 12:55:15 +0300 |
commit | 7c3e42f0196fdd13a61436d83c66418ca8ea6c3b (patch) | |
tree | 48c2a71d15bd49544ffde5f3384a855e381fc27f /spec | |
parent | c9a6f7cb401de7f04a66aec7198e9bd4a5fa615b (diff) |
Fix conflict in spec/models/ci/runner_spec.rb
Diffstat (limited to 'spec')
-rw-r--r-- | spec/models/ci/runner_spec.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/spec/models/ci/runner_spec.rb b/spec/models/ci/runner_spec.rb index ef769a617ed..4c1d3c712f4 100644 --- a/spec/models/ci/runner_spec.rb +++ b/spec/models/ci/runner_spec.rb @@ -198,16 +198,11 @@ describe Ci::Runner do end describe '#assign_to' do -<<<<<<< HEAD - let!(:project) { FactoryBot.create :project } - let!(:shared_runner) { FactoryBot.create(:ci_runner, :shared) } -======= let!(:project) { FactoryBot.create(:project) } ->>>>>>> f91aaccf4d0... Merge branch 'correct-runner-type-when-assigning-shared-to-project' into 'master' subject { runner.assign_to(project) } - context 'with shared_runner' do + context 'with shared runner' do let!(:runner) { FactoryBot.create(:ci_runner, :shared) } it 'transitions shared runner to project runner and assigns project' do |