Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/spec/lib/ci
diff options
context:
space:
mode:
authorKatarzyna Kobierska <kkobierska@gmail.com>2016-08-26 13:49:59 +0300
committerKatarzyna Kobierska <kkobierska@gmail.com>2016-09-07 13:10:49 +0300
commitbbba62fa51419b14be4f39873afdd45b5b248764 (patch)
treec10b2c727c4d392fb0956bb1d61b6cfe36b6eaff /spec/lib/ci
parentcfa18dab86d5408814f4c6083b843205c3d1599e (diff)
Fix errors and grammar
Diffstat (limited to 'spec/lib/ci')
-rw-r--r--spec/lib/ci/gitlab_ci_yaml_processor_spec.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
index 0125f149581..d3a37ba6eb5 100644
--- a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
+++ b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb
@@ -1251,19 +1251,19 @@ EOT
end
end
- describe "#errors(content)" do
+ describe "#errors" do
describe "Error handling" do
- it "returns error if parse YAML failed" do
+ it "returns an error if the YAML could not be parsed" do
content = YAML.dump("invalid: yaml: test")
expect(GitlabCiYamlProcessor.errors(content)).to eq "Invalid configuration format"
end
- it "returns errors if tags parameter is invalid" do
+ it "returns an error if the tags parameter is invalid" do
content = YAML.dump({ rspec: { script: "test", tags: "mysql" } })
expect(GitlabCiYamlProcessor.errors(content)).to eq "jobs:rspec tags should be an array of strings"
end
- it "does not return errors" do
+ it "does not return any errors when the YAML is valid" do
content = File.read(Rails.root.join('spec/support/gitlab_stubs/gitlab_ci.yml'))
expect(GitlabCiYamlProcessor.errors(content)).to eq nil
end