diff options
| author | Phil Hughes <me@iamphill.com> | 2017-06-23 10:44:10 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-06-23 10:44:10 +0100 |
| commit | 6fb7fb5c1a44926511914080334774b21a5ee9af (patch) | |
| tree | 4fdf8530c98576fd19c306a3c74540998bee9fd0 /spec/requests/api/runner_spec.rb | |
| parent | 3b53b553b78d20268d228afa596b53d18046f98e (diff) | |
| parent | 801cf92310e9f6950dddba848ef1e6a3d1e48ef0 (diff) | |
| download | gitlab-ce-6fb7fb5c1a44926511914080334774b21a5ee9af.tar.gz | |
Merge branch 'master' into experimental-top-nav
Diffstat (limited to 'spec/requests/api/runner_spec.rb')
| -rw-r--r-- | spec/requests/api/runner_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/requests/api/runner_spec.rb b/spec/requests/api/runner_spec.rb index d554c242916..339a57a1f20 100644 --- a/spec/requests/api/runner_spec.rb +++ b/spec/requests/api/runner_spec.rb @@ -414,8 +414,8 @@ describe API::Runner do context 'when concurrently updating a job' do before do - expect_any_instance_of(Ci::Build).to receive(:run!). - and_raise(ActiveRecord::StaleObjectError.new(nil, nil)) + expect_any_instance_of(Ci::Build).to receive(:run!) + .and_raise(ActiveRecord::StaleObjectError.new(nil, nil)) end it 'returns a conflict' do |