diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2018-03-14 19:28:08 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2018-03-14 19:28:08 +0000 |
commit | d22e7a421eb323e878a86de36a42aab56c2c53ed (patch) | |
tree | e81fc1eed3fd9bcb851f05ca70356986e64bf072 | |
parent | 42629e08b8d27381ad4dbc8159e249a411aa20a1 (diff) | |
parent | d603de17688d833d8c9416b27cbb083d48a08d3f (diff) | |
download | gitlab-ce-d22e7a421eb323e878a86de36a42aab56c2c53ed.tar.gz |
Merge branch 'ci-lint-dispatcher-fix' into 'master'
Change path of CI lints create index.js file
Closes #44181
See merge request gitlab-org/gitlab-ce!17751
-rw-r--r-- | app/assets/javascripts/pages/ci/lints/new/index.js (renamed from app/assets/javascripts/pages/ci/lints/create/index.js) | 0 | ||||
-rw-r--r-- | spec/features/ci_lint_spec.rb | 1 |
2 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/pages/ci/lints/create/index.js b/app/assets/javascripts/pages/ci/lints/new/index.js index 8e8a843da0b..8e8a843da0b 100644 --- a/app/assets/javascripts/pages/ci/lints/create/index.js +++ b/app/assets/javascripts/pages/ci/lints/new/index.js diff --git a/spec/features/ci_lint_spec.rb b/spec/features/ci_lint_spec.rb index b1dceec9da8..220b934154e 100644 --- a/spec/features/ci_lint_spec.rb +++ b/spec/features/ci_lint_spec.rb @@ -39,6 +39,7 @@ describe 'CI Lint', :js do it 'displays information about an error' do expect(page).to have_content('Status: syntax is incorrect') + expect(page).to have_selector('.ace_content', text: yaml_content) end end |