diff options
author | Katarzyna Kobierska <kkobierska@gmail.com> | 2016-08-30 15:38:36 +0200 |
---|---|---|
committer | Katarzyna Kobierska <kkobierska@gmail.com> | 2016-09-07 12:10:49 +0200 |
commit | 0d81fd05b905e5fe41fee6bb48214748ccf85e78 (patch) | |
tree | ecda31a5ba5559754a1e2cbbd9399fb9e9f22bd9 /spec | |
parent | 1a7a900d8e4a4a3a65b33054168fdd86f252b757 (diff) | |
download | gitlab-ce-0d81fd05b905e5fe41fee6bb48214748ccf85e78.tar.gz |
Code refactor
Diffstat (limited to 'spec')
-rw-r--r-- | spec/lib/ci/gitlab_ci_yaml_processor_spec.rb | 2 | ||||
-rw-r--r-- | spec/requests/api/lint_spec.rb | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb index 3b77dbdb817..43631070024 100644 --- a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb +++ b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb @@ -1251,7 +1251,7 @@ EOT end end - describe "#errors" do + describe "#validation_message" do context "when the YAML could not be parsed" do it "returns an error about invalid configutaion" do content = YAML.dump("invalid: yaml: test") diff --git a/spec/requests/api/lint_spec.rb b/spec/requests/api/lint_spec.rb index c791b4891b6..391fc13a380 100644 --- a/spec/requests/api/lint_spec.rb +++ b/spec/requests/api/lint_spec.rb @@ -4,11 +4,11 @@ describe API::Lint, api: true do include ApiHelpers describe 'POST /ci/lint' do - let(:yaml_content) do - File.read(Rails.root.join('spec/support/gitlab_stubs/gitlab_ci.yml')) - end - context 'with valid .gitlab-ci.yaml content' do + let(:yaml_content) do + File.read(Rails.root.join('spec/support/gitlab_stubs/gitlab_ci.yml')) + end + it 'passes validation' do post api('/ci/lint'), { content: yaml_content } |