diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-24 00:46:50 +0300 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-06-24 01:22:58 +0300 |
commit | a0ce7cf3d2e0f1ccb369da97167cc41ded2cabf6 (patch) | |
tree | 958a40d8dce5da0a1b49f241f7e0e24d2ac2db5c /spec | |
parent | a23e108ea604426d6c0b430cd7378647fb5fa0a4 (diff) |
Merge branch '19008_ci_dropdown_label_fix' into 'master'
Apply selected value as label
## What does this MR do?
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
## What are the relevant issue numbers?
## Screenshots (if relevant)
![dropdown-label](/uploads/db2ea7cb3cc51fbdeea53c304f1bd7a5/dropdown-label.gif)
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [x] Added for this feature/bug
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !4886
Diffstat (limited to 'spec')
-rw-r--r-- | spec/features/projects/files/gitignore_dropdown_spec.rb | 1 | ||||
-rw-r--r-- | spec/features/projects/files/gitlab_ci_yml_dropdown_spec.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/spec/features/projects/files/gitignore_dropdown_spec.rb b/spec/features/projects/files/gitignore_dropdown_spec.rb index 073a83b6896..9ebef505b92 100644 --- a/spec/features/projects/files/gitignore_dropdown_spec.rb +++ b/spec/features/projects/files/gitignore_dropdown_spec.rb @@ -24,6 +24,7 @@ feature 'User wants to add a .gitignore file', feature: true do end wait_for_ajax + expect(page).to have_css('.gitignore-selector .dropdown-toggle-text', text: 'Rails') expect(page).to have_content('/.bundle') expect(page).to have_content('# Gemfile.lock, .ruby-version, .ruby-gemset') end diff --git a/spec/features/projects/files/gitlab_ci_yml_dropdown_spec.rb b/spec/features/projects/files/gitlab_ci_yml_dropdown_spec.rb index d516e8ce55a..b8c06c383fb 100644 --- a/spec/features/projects/files/gitlab_ci_yml_dropdown_spec.rb +++ b/spec/features/projects/files/gitlab_ci_yml_dropdown_spec.rb @@ -24,6 +24,7 @@ feature 'User wants to add a .gitlab-ci.yml file', feature: true do end wait_for_ajax + expect(page).to have_css('.gitlab-ci-yml-selector .dropdown-toggle-text', text: 'jekyll') expect(page).to have_content('This file is a template, and might need editing before it works on your project') expect(page).to have_content('jekyll build -d test') end |