diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-11-24 04:27:13 +0300 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-11-24 04:27:13 +0300 |
commit | 4b7164295f938e9cc9e908664955bc461177c840 (patch) | |
tree | 17980fdb89d2d0160e0ab5a8d7e663ab0bacfedc /spec | |
parent | 0bcce7c008d48a10a839c390d99d32911ab9eca2 (diff) | |
parent | 8434a642f19798f8ed8ce283af6a1006920bef30 (diff) |
Merge branch 'simplify-create-new-list-issue-boards' into 'master'
Simplify copy on "Create a new list" dropdown in Issue Boards
## What does this MR do?
It changes the "Create new list" text to simply "Add list". It also describes the operation in a more concise way. It was suggested in #24659.
## Are there points in the code the reviewer needs to double check?
Although I refactored references to the name of the button to reflect the new text, I left part of the documentation unmodified:
File: `doc/user/project/issue_board.md`
```
In short, here's a list of actions you can take in an Issue Board:
- [Create a new list](#creating-a-new-list).
- [Delete an existing list](#deleting-a-list).
```
because I was not sure if changing those was necessary.
Additionally, I replaced every occurrence of `click_button 'Create new list'` with `click_button 'Add list'`in the spec. I'm not sure if that causes any change in behavior as I am not sure if there are any hooks to the previous name, explicitly.
File: `spec/features/boards/boards_spec.rb`
## Why was this MR needed?
It is an improvement, as suggested in #24659
## Screenshots (if relevant)
**Before:**
![before](/uploads/cffd30b0e9a21d16bc25d046eb4ca42b/before.png)
**After:**
![after2](/uploads/95b049e0c1c565c4ccd1a72a3f4be925/after2.png)
## Does this MR meet the acceptance criteria?
- [X] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [X] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [X] All builds are passing
- [X] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [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 it does - rebase it please)
- [X] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
#24659
See merge request !7605
Diffstat (limited to 'spec')
-rw-r--r-- | spec/features/boards/boards_spec.rb | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/spec/features/boards/boards_spec.rb b/spec/features/boards/boards_spec.rb index 4aa84fb65d9..973d5b286e9 100644 --- a/spec/features/boards/boards_spec.rb +++ b/spec/features/boards/boards_spec.rb @@ -158,7 +158,7 @@ describe 'Issue Boards', feature: true, js: true do end it 'removes checkmark in new list dropdown after deleting' do - click_button 'Create new list' + click_button 'Add list' wait_for_ajax page.within(find('.board:nth-child(2)')) do @@ -304,7 +304,7 @@ describe 'Issue Boards', feature: true, js: true do context 'new list' do it 'shows all labels in new list dropdown' do - click_button 'Create new list' + click_button 'Add list' wait_for_ajax page.within('.dropdown-menu-issues-board-new') do @@ -315,7 +315,7 @@ describe 'Issue Boards', feature: true, js: true do end it 'creates new list for label' do - click_button 'Create new list' + click_button 'Add list' wait_for_ajax page.within('.dropdown-menu-issues-board-new') do @@ -328,7 +328,7 @@ describe 'Issue Boards', feature: true, js: true do end it 'creates new list for Backlog label' do - click_button 'Create new list' + click_button 'Add list' wait_for_ajax page.within('.dropdown-menu-issues-board-new') do @@ -341,7 +341,7 @@ describe 'Issue Boards', feature: true, js: true do end it 'creates new list for Done label' do - click_button 'Create new list' + click_button 'Add list' wait_for_ajax page.within('.dropdown-menu-issues-board-new') do @@ -354,7 +354,7 @@ describe 'Issue Boards', feature: true, js: true do end it 'keeps dropdown open after adding new list' do - click_button 'Create new list' + click_button 'Add list' wait_for_ajax page.within('.dropdown-menu-issues-board-new') do @@ -369,7 +369,7 @@ describe 'Issue Boards', feature: true, js: true do it 'moves issues from backlog into new list' do wait_for_board_cards(1, 6) - click_button 'Create new list' + click_button 'Add list' wait_for_ajax page.within('.dropdown-menu-issues-board-new') do @@ -382,7 +382,7 @@ describe 'Issue Boards', feature: true, js: true do end it 'creates new list from a new label' do - click_button 'Create new list' + click_button 'Add list' wait_for_ajax |