summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-01-31 16:35:04 +0000
committerFatih Acet <acetfatih@gmail.com>2017-02-03 17:02:44 +0300
commitcf5396d4b7158a97a49b3a75c6ebc8938954bd2b (patch)
tree4d91b3b5aebf30c155f9b4e2703f8367f978250f
parent00b835bad9d68dbc16367bd66afcbf99ca248203 (diff)
downloadgitlab-ce-cf5396d4b7158a97a49b3a75c6ebc8938954bd2b.tar.gz
Fixed up specs
-rw-r--r--spec/features/boards/add_issues_modal_spec.rb4
-rw-r--r--spec/features/boards/sidebar_spec.rb18
-rw-r--r--spec/javascripts/boards/boards_store_spec.js.es62
3 files changed, 3 insertions, 21 deletions
diff --git a/spec/features/boards/add_issues_modal_spec.rb b/spec/features/boards/add_issues_modal_spec.rb
index ae245d7469b..b953480cec2 100644
--- a/spec/features/boards/add_issues_modal_spec.rb
+++ b/spec/features/boards/add_issues_modal_spec.rb
@@ -142,13 +142,13 @@ describe 'Issue Boards add issue modal', :feature, :js do
end
end
- it 'un-selects all issues' do
+ it 'deselects all issues' do
page.within('.add-issues-modal') do
click_button 'Select all'
expect(page).to have_selector('.is-active', count: 2)
- click_button 'Un-select all'
+ click_button 'Deselect all'
expect(page).not_to have_selector('.is-active')
end
diff --git a/spec/features/boards/sidebar_spec.rb b/spec/features/boards/sidebar_spec.rb
index ea135d0cc95..9cc50167395 100644
--- a/spec/features/boards/sidebar_spec.rb
+++ b/spec/features/boards/sidebar_spec.rb
@@ -84,24 +84,6 @@ describe 'Issue Boards', feature: true, js: true do
end
end
- it 'does not show remove issue button when issue is closed' do
- page.within(first('.board')) do
- first('.card').click
- end
-
- page.within('.issue-boards-sidebar') do
- click_button 'Remove from board'
- end
-
- page.within(find('.board:nth-child(2)')) do
- first('.card').click
- end
-
- page.within('.issue-boards-sidebar') do
- expect(page).not_to have_button 'Remove from board'
- end
- end
-
context 'assignee' do
it 'updates the issues assignee' do
page.within(first('.board')) do
diff --git a/spec/javascripts/boards/boards_store_spec.js.es6 b/spec/javascripts/boards/boards_store_spec.js.es6
index a0d434e3588..0c9c889a444 100644
--- a/spec/javascripts/boards/boards_store_spec.js.es6
+++ b/spec/javascripts/boards/boards_store_spec.js.es6
@@ -23,7 +23,7 @@
describe('Store', () => {
beforeEach(() => {
Vue.http.interceptors.push(boardsMockInterceptor);
- gl.boardService = new BoardService('/test/issue-boards/board', '1');
+ gl.boardService = new BoardService('/test/issue-boards/board', '', '1');
gl.issueBoards.BoardsStore.create();
Cookies.set('issue_board_welcome_hidden', 'false', {