Commit 2e7bd099 authored by Phil Hughes's avatar Phil Hughes

Fixed tests

parent cf4e8395
...@@ -531,7 +531,8 @@ ...@@ -531,7 +531,8 @@
border-radius: 50%; border-radius: 50%;
} }
.issue-boards-switcher {
.boards-switcher {
padding-right: 10px; padding-right: 10px;
margin-right: 10px; margin-right: 10px;
border-right: 1px solid $white-dark; border-right: 1px solid $white-dark;
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
.issues-filters .issues-filters
.issues-details-filters.row-content-block.second-block .issues-details-filters.row-content-block.second-block
- if boards_page && board - if boards_page && board
#js-multiple-boards-switcher.filter-item.inline.issue-boards-switcher{ "v-cloak" => true } #js-multiple-boards-switcher.filter-item.inline.boards-switcher{ "v-cloak" => true }
= render "projects/boards/switcher", board: board = render "projects/boards/switcher", board: board
= form_tag page_filter_path(without: [:assignee_id, :author_id, :milestone_title, :label_name, :search]), method: :get, class: 'filter-form js-filter-form' do = form_tag page_filter_path(without: [:assignee_id, :author_id, :milestone_title, :label_name, :search]), method: :get, class: 'filter-form js-filter-form' do
- if params[:search].present? - if params[:search].present?
......
...@@ -29,7 +29,7 @@ describe 'Multiple Issue Boards', feature: true, js: true do ...@@ -29,7 +29,7 @@ describe 'Multiple Issue Boards', feature: true, js: true do
it 'shows a list of boards' do it 'shows a list of boards' do
click_button board.name click_button board.name
page.within('.boards-title-holder .dropdown-menu') do page.within('.dropdown-menu') do
expect(page).to have_content(board.name) expect(page).to have_content(board.name)
expect(page).to have_content(board2.name) expect(page).to have_content(board2.name)
end end
...@@ -38,7 +38,7 @@ describe 'Multiple Issue Boards', feature: true, js: true do ...@@ -38,7 +38,7 @@ describe 'Multiple Issue Boards', feature: true, js: true do
it 'switches current board' do it 'switches current board' do
click_button board.name click_button board.name
page.within('.boards-title-holder .dropdown-menu') do page.within('.dropdown-menu') do
click_link board2.name click_link board2.name
end end
...@@ -52,7 +52,7 @@ describe 'Multiple Issue Boards', feature: true, js: true do ...@@ -52,7 +52,7 @@ describe 'Multiple Issue Boards', feature: true, js: true do
it 'creates new board' do it 'creates new board' do
click_button board.name click_button board.name
page.within('.boards-title-holder .dropdown-menu') do page.within('.dropdown-menu') do
click_link 'Edit board name' click_link 'Edit board name'
fill_in 'board-new-name', with: 'Testing' fill_in 'board-new-name', with: 'Testing'
...@@ -62,7 +62,7 @@ describe 'Multiple Issue Boards', feature: true, js: true do ...@@ -62,7 +62,7 @@ describe 'Multiple Issue Boards', feature: true, js: true do
wait_for_vue_resource wait_for_vue_resource
page.within('.boards-title-holder .dropdown-menu') do page.within('.dropdown-menu') do
expect(page).to have_content('Testing') expect(page).to have_content('Testing')
end end
end end
...@@ -70,7 +70,7 @@ describe 'Multiple Issue Boards', feature: true, js: true do ...@@ -70,7 +70,7 @@ describe 'Multiple Issue Boards', feature: true, js: true do
it 'edits board name' do it 'edits board name' do
click_button board.name click_button board.name
page.within('.boards-title-holder .dropdown-menu') do page.within('.dropdown-menu') do
click_link 'Edit board name' click_link 'Edit board name'
fill_in 'board-new-name', with: 'Testing' fill_in 'board-new-name', with: 'Testing'
...@@ -80,7 +80,7 @@ describe 'Multiple Issue Boards', feature: true, js: true do ...@@ -80,7 +80,7 @@ describe 'Multiple Issue Boards', feature: true, js: true do
wait_for_vue_resource wait_for_vue_resource
page.within('.boards-title-holder .dropdown-menu') do page.within('.dropdown-menu') do
expect(page).to have_content('Testing') expect(page).to have_content('Testing')
end end
end end
...@@ -90,7 +90,7 @@ describe 'Multiple Issue Boards', feature: true, js: true do ...@@ -90,7 +90,7 @@ describe 'Multiple Issue Boards', feature: true, js: true do
wait_for_vue_resource wait_for_vue_resource
page.within('.boards-title-holder .dropdown-menu') do page.within('.dropdown-menu') do
click_link 'Delete board' click_link 'Delete board'
page.within('.dropdown-title') do page.within('.dropdown-title') do
...@@ -102,7 +102,7 @@ describe 'Multiple Issue Boards', feature: true, js: true do ...@@ -102,7 +102,7 @@ describe 'Multiple Issue Boards', feature: true, js: true do
click_button board2.name click_button board2.name
page.within('.boards-title-holder .dropdown-menu') do page.within('.dropdown-menu') do
expect(page).not_to have_content(board.name) expect(page).not_to have_content(board.name)
expect(page).to have_content(board2.name) expect(page).to have_content(board2.name)
end end
...@@ -111,7 +111,7 @@ describe 'Multiple Issue Boards', feature: true, js: true do ...@@ -111,7 +111,7 @@ describe 'Multiple Issue Boards', feature: true, js: true do
it 'adds a list to the none default board' do it 'adds a list to the none default board' do
click_button board.name click_button board.name
page.within('.boards-title-holder .dropdown-menu') do page.within('.dropdown-menu') do
click_link board2.name click_link board2.name
end end
...@@ -135,7 +135,7 @@ describe 'Multiple Issue Boards', feature: true, js: true do ...@@ -135,7 +135,7 @@ describe 'Multiple Issue Boards', feature: true, js: true do
click_button board2.name click_button board2.name
page.within('.boards-title-holder .dropdown-menu') do page.within('.dropdown-menu') do
click_link board.name click_link board.name
end end
...@@ -154,7 +154,7 @@ describe 'Multiple Issue Boards', feature: true, js: true do ...@@ -154,7 +154,7 @@ describe 'Multiple Issue Boards', feature: true, js: true do
it 'does not show action links' do it 'does not show action links' do
click_button board.name click_button board.name
page.within('.boards-title-holder .dropdown-menu') do page.within('.dropdown-menu') do
expect(page).not_to have_content('Create new board') expect(page).not_to have_content('Create new board')
expect(page).not_to have_content('Edit board name') expect(page).not_to have_content('Edit board name')
expect(page).not_to have_content('Delete board') expect(page).not_to have_content('Delete board')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment