summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2017-09-01 22:01:26 +0900
committerShinya Maeda <shinya@gitlab.com>2017-09-05 14:30:28 +0900
commite8e8ae4d7df1de71d9f52e774607ac1ba4cce1cc (patch)
tree40e6b10f5f32558f714f93559334b9e7a0dd34e0
parent68f6c61cf621db82ac98d561782590b1866fcf6f (diff)
downloadgitlab-ce-e8e8ae4d7df1de71d9f52e774607ac1ba4cce1cc.tar.gz
Fix spec
-rw-r--r--spec/models/commit_status_spec.rb5
-rw-r--r--spec/requests/api/commit_statuses_spec.rb2
2 files changed, 5 insertions, 2 deletions
diff --git a/spec/models/commit_status_spec.rb b/spec/models/commit_status_spec.rb
index f5c1db79823..0a6b0023dea 100644
--- a/spec/models/commit_status_spec.rb
+++ b/spec/models/commit_status_spec.rb
@@ -447,7 +447,10 @@ describe CommitStatus do
describe 'set failure_reason when drop' do
let(:commit_status) { create(:commit_status, :created) }
- subject { commit_status.drop!(reason); commit_status }
+ subject do
+ commit_status.drop!(reason)
+ commit_status
+ end
context 'when failure_reason is nil' do
let(:reason) { }
diff --git a/spec/requests/api/commit_statuses_spec.rb b/spec/requests/api/commit_statuses_spec.rb
index ed1962ede42..e4c73583545 100644
--- a/spec/requests/api/commit_statuses_spec.rb
+++ b/spec/requests/api/commit_statuses_spec.rb
@@ -143,7 +143,7 @@ describe API::CommitStatuses do
expect(json_response['target_url']).to be_nil
expect(json_response['description']).to be_nil
if status == 'failed'
- expect(json_response['failure_reason']).to eq('api_failure')
+ expect(CommitStatus.find(json_response['id'])).to be_api_failure
end
end
end