Commit c08fea6f authored by Sean McGivern's avatar Sean McGivern

Merge branch 'backport-ee-2869' into 'master'

backport for gitlab-ee!2869

See merge request gitlab-org/gitlab-ce!14505
parents 3dbfd298 c9a7f51b
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
show_any: "true", show_any: "true",
project_id: @project&.try(:id), project_id: @project&.try(:id),
labels: labels_filter_path(false), labels: labels_filter_path(false),
namespace_path: @project.try(:namespace).try(:full_path), namespace_path: @namespace_path,
project_path: @project.try(:path) }, project_path: @project.try(:path) },
":data-issue-update" => "'#{build_issue_link_base}/' + issue.iid + '.json'" } ":data-issue-update" => "'#{build_issue_link_base}/' + issue.iid + '.json'" }
%span.dropdown-toggle-text %span.dropdown-toggle-text
......
require 'rails_helper' require 'rails_helper'
describe 'Issue Boards', :js do describe 'Issue Boards', :js do
include BoardHelpers
let(:user) { create(:user) } let(:user) { create(:user) }
let(:user2) { create(:user) } let(:user2) { create(:user) }
let(:project) { create(:project, :public) } let(:project) { create(:project, :public) }
...@@ -309,6 +311,21 @@ describe 'Issue Boards', :js do ...@@ -309,6 +311,21 @@ describe 'Issue Boards', :js do
expect(card).to have_selector('.label', count: 1) expect(card).to have_selector('.label', count: 1)
expect(card).not_to have_content(stretch.title) expect(card).not_to have_content(stretch.title)
end end
it 'creates new label' do
click_card(card)
page.within('.labels') do
click_link 'Edit'
click_link 'Create new label'
fill_in 'new_label_name', with: 'test label'
first('.suggest-colors-dropdown a').click
click_button 'Create'
wait_for_requests
expect(page).to have_link 'test label'
end
end
end end
context 'subscription' do context 'subscription' do
...@@ -322,19 +339,4 @@ describe 'Issue Boards', :js do ...@@ -322,19 +339,4 @@ describe 'Issue Boards', :js do
end end
end end
end end
def click_card(card)
page.within(card) do
first('.card-number').click
end
wait_for_sidebar
end
def wait_for_sidebar
# loop until the CSS transition is complete
Timeout.timeout(0.5) do
loop until evaluate_script('$(".right-sidebar").outerWidth()') == 290
end
end
end end
module BoardHelpers
def click_card(card)
within card do
first('.card-number').click
end
wait_for_sidebar
end
def wait_for_sidebar
# loop until the CSS transition is complete
Timeout.timeout(0.5) do
loop until evaluate_script('$(".right-sidebar").outerWidth()') == 290
end
end
end
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