summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorKatarzyna Kobierska <kkobierska@gmail.com>2016-08-30 13:03:29 +0200
committerKatarzyna Kobierska <kkobierska@gmail.com>2016-09-07 12:10:49 +0200
commit1a7a900d8e4a4a3a65b33054168fdd86f252b757 (patch)
tree8420740a7ddbbdcce6e18141684a2e8cbc326a49 /spec
parent2c8b830fdbf749e8bb7461d5c3ce4699b77ce3ca (diff)
downloadgitlab-ce-1a7a900d8e4a4a3a65b33054168fdd86f252b757.tar.gz
Improve code
Diffstat (limited to 'spec')
-rw-r--r--spec/lib/ci/gitlab_ci_yaml_processor_spec.rb9
-rw-r--r--spec/requests/api/lint_spec.rb6
2 files changed, 9 insertions, 6 deletions
diff --git a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
index 21aca9ee39f..3b77dbdb817 100644
--- a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
+++ b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
@@ -1256,7 +1256,8 @@ EOT
it "returns an error about invalid configutaion" do
content = YAML.dump("invalid: yaml: test")
- expect(GitlabCiYamlProcessor.validation_message(content)).to eq "Invalid configuration format"
+ expect(GitlabCiYamlProcessor.validation_message(content))
+ .to eq "Invalid configuration format"
end
end
@@ -1264,13 +1265,15 @@ EOT
it "returns an error about invalid tags" do
content = YAML.dump({ rspec: { script: "test", tags: "mysql" } })
- expect(GitlabCiYamlProcessor.validation_message(content)).to eq "jobs:rspec tags should be an array of strings"
+ expect(GitlabCiYamlProcessor.validation_message(content))
+ .to eq "jobs:rspec tags should be an array of strings"
end
end
context "when YMAL content is empty" do
it "returns an error about missing content" do
- expect(GitlabCiYamlProcessor.validation_message('')).to eq "Please provide content of .gitlab-ci.yml"
+ expect(GitlabCiYamlProcessor.validation_message(''))
+ .to eq "Please provide content of .gitlab-ci.yml"
end
end
diff --git a/spec/requests/api/lint_spec.rb b/spec/requests/api/lint_spec.rb
index 5f8c2829dfa..c791b4891b6 100644
--- a/spec/requests/api/lint_spec.rb
+++ b/spec/requests/api/lint_spec.rb
@@ -15,7 +15,7 @@ describe API::Lint, api: true do
expect(response).to have_http_status(200)
expect(json_response).to be_an Hash
expect(json_response['status']).to eq('valid')
- expect(json_response['error']).to eq('')
+ expect(json_response['errors']).to eq([])
end
end
@@ -25,7 +25,7 @@ describe API::Lint, api: true do
expect(response).to have_http_status(200)
expect(json_response['status']).to eq('invalid')
- expect(json_response['error']).to eq('Invalid configuration format')
+ expect(json_response['errors']).to eq(['Invalid configuration format'])
end
it "responds with errors about invalid configuration" do
@@ -33,7 +33,7 @@ describe API::Lint, api: true do
expect(response).to have_http_status(200)
expect(json_response['status']).to eq('invalid')
- expect(json_response['error']).to eq('jobs config should contain at least one visible job')
+ expect(json_response['errors']).to eq(['jobs config should contain at least one visible job'])
end
end