summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <gitlab.shinyamaeda@gmail.com>2017-03-17 17:59:13 +0900
committerShinya Maeda <gitlab.shinyamaeda@gmail.com>2017-05-03 02:11:51 +0900
commitf0e3076a32f1f127ef4d31b53979edd5e0218469 (patch)
treed989ac2e79ed2549f9e183c4723e4570186426ac
parent974c3c132f5241cf58103e5e01e8b54256749a87 (diff)
downloadgitlab-ce-f0e3076a32f1f127ef4d31b53979edd5e0218469.tar.gz
'to be > 0' to 'not_to be_empty'. 'to eq(0)' to 'to be_empty'
-rw-r--r--spec/requests/api/pipelines_spec.rb18
1 files changed, 9 insertions, 9 deletions
diff --git a/spec/requests/api/pipelines_spec.rb b/spec/requests/api/pipelines_spec.rb
index 90214f785d9..e3cda85b244 100644
--- a/spec/requests/api/pipelines_spec.rb
+++ b/spec/requests/api/pipelines_spec.rb
@@ -50,7 +50,7 @@ describe API::Pipelines do
expect(response).to have_http_status(200)
expect(response).to include_pagination_headers
- expect(json_response.count).to be > 0
+ expect(json_response).not_to be_empty
json_response.each { |r| expect(r['status']).to eq(target) }
end
end
@@ -62,7 +62,7 @@ describe API::Pipelines do
expect(response).to have_http_status(200)
expect(response).to include_pagination_headers
- expect(json_response.count).to be > 0
+ expect(json_response).not_to be_empty
json_response.each { |r| expect(r['status']).to be_in(%w[success failed canceled]) }
end
end
@@ -73,7 +73,7 @@ describe API::Pipelines do
expect(response).to have_http_status(200)
expect(response).to include_pagination_headers
- expect(json_response.count).to be > 0
+ expect(json_response).not_to be_empty
expect(json_response.last['sha']).to eq(Ci::Pipeline.where(tag: false).last.sha)
end
end
@@ -84,7 +84,7 @@ describe API::Pipelines do
expect(response).to have_http_status(200)
expect(response).to include_pagination_headers
- expect(json_response.count).to be > 0
+ expect(json_response).not_to be_empty
expect(json_response.last['sha']).to eq(Ci::Pipeline.where(tag: true).last.sha)
end
end
@@ -106,7 +106,7 @@ describe API::Pipelines do
expect(response).to have_http_status(200)
expect(response).to include_pagination_headers
- expect(json_response.count).to be > 0
+ expect(json_response).not_to be_empty
json_response.each { |r| expect(r['status']).to eq(target) }
end
end
@@ -128,7 +128,7 @@ describe API::Pipelines do
expect(response).to have_http_status(200)
expect(response).to include_pagination_headers
- expect(json_response.count).to be > 0
+ expect(json_response).not_to be_empty
json_response.each { |r| expect(r['ref']).to eq('master') }
end
end
@@ -139,7 +139,7 @@ describe API::Pipelines do
expect(response).to have_http_status(200)
expect(response).to include_pagination_headers
- expect(json_response.count).to eq(0)
+ expect(json_response).to be_empty
end
end
end
@@ -161,7 +161,7 @@ describe API::Pipelines do
expect(response).to have_http_status(200)
expect(response).to include_pagination_headers
- expect(json_response.count).to eq(0)
+ expect(json_response).to be_empty
end
end
end
@@ -183,7 +183,7 @@ describe API::Pipelines do
expect(response).to have_http_status(200)
expect(response).to include_pagination_headers
- expect(json_response.count).to eq(0)
+ expect(json_response).to be_empty
end
end
end