diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-16 16:29:35 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-16 16:29:35 +0000 |
commit | c6701d45474acab6a2d687d2e2ffdaac5c0d5491 (patch) | |
tree | 5e18ab8b3e41bed293e4e1748f780c0fad94fd79 /spec/features | |
parent | 451cbe1f69d65b24568a53ec7aa4a7fba2c46933 (diff) | |
parent | 0520ee44985528d3076df1208bda7c6c7ff8ec79 (diff) | |
download | gitlab-ce-c6701d45474acab6a2d687d2e2ffdaac5c0d5491.tar.gz |
Merge branch 'issue_20900' into 'master'
Remove issuable drag and drop and sorting from milestone view
Closes #20900
See merge request !11950
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/dashboard/milestone_tabs_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/milestones/milestones_spec.rb | 151 |
2 files changed, 73 insertions, 80 deletions
diff --git a/spec/features/dashboard/milestone_tabs_spec.rb b/spec/features/dashboard/milestone_tabs_spec.rb index 0c7b992c500..2c48939bf9c 100644 --- a/spec/features/dashboard/milestone_tabs_spec.rb +++ b/spec/features/dashboard/milestone_tabs_spec.rb @@ -23,7 +23,7 @@ describe 'Dashboard milestone tabs', :js, :feature do it 'loads merge requests async' do click_link 'Merge Requests' - expect(page).to have_selector('.merge_requests-sortable-list') + expect(page).to have_selector('.milestone-merge_requests-list') end it 'loads participants async' do diff --git a/spec/features/milestones/milestones_spec.rb b/spec/features/milestones/milestones_spec.rb index c8a4d23f695..9e117c8ed9f 100644 --- a/spec/features/milestones/milestones_spec.rb +++ b/spec/features/milestones/milestones_spec.rb @@ -1,109 +1,102 @@ -require 'rails_helper' +# require 'rails_helper' -describe 'Milestone draggable', feature: true, js: true do - include DragTo +# describe 'Milestone draggable', feature: true, js: true do +# include DragTo - let(:milestone) { create(:milestone, project: project, title: 8.14) } - let(:project) { create(:empty_project, :public) } - let(:user) { create(:user) } +# let(:milestone) { create(:milestone, project: project, title: 8.14) } +# let(:project) { create(:empty_project, :public) } +# let(:user) { create(:user) } - context 'issues' do - let(:issue) { page.find_by_id('issues-list-unassigned').find('li') } - let(:issue_target) { page.find_by_id('issues-list-ongoing') } +# context 'issues' do +# let(:issue) { page.find_by_id('issues-list-unassigned').find('li') } +# let(:issue_target) { page.find_by_id('issues-list-ongoing') } - it 'does not allow guest to drag issue' do - create_and_drag_issue +# it 'does not allow guest to drag issue' do +# create_and_drag_issue - expect(issue_target).not_to have_selector('.issuable-row') - end +# expect(issue_target).not_to have_selector('.issuable-row') +# end - it 'does not allow authorized user to drag issue' do - login_as(user) - create_and_drag_issue +# it 'does not allow authorized user to drag issue' do +# login_as(user) +# create_and_drag_issue - expect(issue_target).not_to have_selector('.issuable-row') - end +# expect(issue_target).not_to have_selector('.issuable-row') +# end - it 'allows author to drag issue' do - login_as(user) - create_and_drag_issue(author: user) +# it 'allows author to drag issue' do +# login_as(user) +# create_and_drag_issue(author: user) - expect(issue_target).to have_selector('.issuable-row') - end +# expect(issue_target).to have_selector('.issuable-row') +# end - it 'allows admin to drag issue' do - login_as(:admin) - create_and_drag_issue +# it 'allows admin to drag issue' do +# login_as(:admin) - expect(issue_target).to have_selector('.issuable-row') - end +# create_and_drag_issue - it 'assigns issue when it has been dragged to ongoing list' do - login_as(:admin) - create_and_drag_issue +# expect(issue_target).to have_selector('.issuable-row') +# end +# end - expect(@issue.reload.assignees).not_to be_empty - expect(page).to have_selector("#sortable_issue_#{@issue.iid} .assignee-icon img", count: 1) - end - end +# context 'merge requests' do +# let(:merge_request) { page.find_by_id('merge_requests-list-unassigned').find('li') } +# let(:merge_request_target) { page.find_by_id('merge_requests-list-ongoing') } - context 'merge requests' do - let(:merge_request) { page.find_by_id('merge_requests-list-unassigned').find('li') } - let(:merge_request_target) { page.find_by_id('merge_requests-list-ongoing') } +# it 'does not allow guest to drag merge request' do +# create_and_drag_merge_request - it 'does not allow guest to drag merge request' do - create_and_drag_merge_request +# expect(merge_request_target).not_to have_selector('.issuable-row') +# end - expect(merge_request_target).not_to have_selector('.issuable-row') - end +# it 'does not allow authorized user to drag merge request' do +# login_as(user) +# create_and_drag_merge_request - it 'does not allow authorized user to drag merge request' do - login_as(user) - create_and_drag_merge_request +# expect(merge_request_target).not_to have_selector('.issuable-row') +# end - expect(merge_request_target).not_to have_selector('.issuable-row') - end +# it 'allows author to drag merge request' do +# login_as(user) +# create_and_drag_merge_request(author: user) - it 'allows author to drag merge request' do - login_as(user) - create_and_drag_merge_request(author: user) +# expect(merge_request_target).to have_selector('.issuable-row') +# end - expect(merge_request_target).to have_selector('.issuable-row') - end +# it 'allows admin to drag merge request' do +# login_as(:admin) +# create_and_drag_merge_request - it 'allows admin to drag merge request' do - login_as(:admin) - create_and_drag_merge_request +# expect(merge_request_target).to have_selector('.issuable-row') +# end +# end - expect(merge_request_target).to have_selector('.issuable-row') - end - end +# def create_and_drag_issue(params = {}) +# create(:issue, params.merge(title: 'Foo', project: project, milestone: milestone)) - def create_and_drag_issue(params = {}) - @issue = create(:issue, params.merge(title: 'Foo', project: project, milestone: milestone)) +# visit namespace_project_milestone_path(project.namespace, project, milestone) +# scroll_into_view('.milestone-content') +# drag_to(selector: '.issues-sortable-list', list_to_index: 1) - visit namespace_project_milestone_path(project.namespace, project, milestone) - scroll_into_view('.milestone-content') - drag_to(selector: '.issues-sortable-list', list_to_index: 1) +# wait_for_requests +# end - wait_for_requests - end +# def create_and_drag_merge_request(params = {}) +# create(:merge_request, params.merge(title: 'Foo', source_project: project, target_project: project, milestone: milestone)) - def create_and_drag_merge_request(params = {}) - create(:merge_request, params.merge(title: 'Foo', source_project: project, target_project: project, milestone: milestone)) +# visit namespace_project_milestone_path(project.namespace, project, milestone) +# page.find("a[href='#tab-merge-requests']").click - visit namespace_project_milestone_path(project.namespace, project, milestone) - page.find("a[href='#tab-merge-requests']").click +# wait_for_requests - wait_for_requests +# scroll_into_view('.milestone-content') +# drag_to(selector: '.merge_requests-sortable-list', list_to_index: 1) - scroll_into_view('.milestone-content') - drag_to(selector: '.merge_requests-sortable-list', list_to_index: 1) +# wait_for_requests +# end - wait_for_requests - end - - def scroll_into_view(selector) - page.evaluate_script("document.querySelector('#{selector}').scrollIntoView();") - end -end +# def scroll_into_view(selector) +# page.evaluate_script("document.querySelector('#{selector}').scrollIntoView();") +# end +# end |