diff options
author | Robert Speicher <robert@gitlab.com> | 2017-10-09 12:52:51 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2017-10-09 12:52:51 +0000 |
commit | 2409acfa7f97fef81dd66640c64e9d0008b85cde (patch) | |
tree | 1dcafa5cd5b4646ddaf6d736cc2a15d60d0f0c19 /spec/features/dashboard/merge_requests_spec.rb | |
parent | 0f366c74131339cb45c8943437fe5b3e68721c75 (diff) | |
parent | f277fa14094e5515e2317d2baa1fa0bfb95966da (diff) | |
download | gitlab-ce-2409acfa7f97fef81dd66640c64e9d0008b85cde.tar.gz |
Merge branch 'master' into 'group-sort-dropdown-blank'
# Conflicts:
# spec/features/dashboard/group_spec.rb
Diffstat (limited to 'spec/features/dashboard/merge_requests_spec.rb')
-rw-r--r-- | spec/features/dashboard/merge_requests_spec.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/spec/features/dashboard/merge_requests_spec.rb b/spec/features/dashboard/merge_requests_spec.rb index 8204828b5b9..f01ba442e58 100644 --- a/spec/features/dashboard/merge_requests_spec.rb +++ b/spec/features/dashboard/merge_requests_spec.rb @@ -3,12 +3,13 @@ require 'spec_helper' feature 'Dashboard Merge Requests' do include FilterItemSelectHelper include SortingHelper + include ProjectForksHelper let(:current_user) { create :user } let(:project) { create(:project) } let(:public_project) { create(:project, :public, :repository) } - let(:forked_project) { Projects::ForkService.new(public_project, current_user).execute } + let(:forked_project) { fork_project(public_project, current_user, repository: true) } before do project.add_master(current_user) @@ -23,7 +24,7 @@ feature 'Dashboard Merge Requests' do visit merge_requests_dashboard_path end - it 'shows projects only with merge requests feature enabled', js: true do + it 'shows projects only with merge requests feature enabled', :js do find('.new-project-item-select-button').trigger('click') page.within('.select2-results') do @@ -88,7 +89,7 @@ feature 'Dashboard Merge Requests' do expect(page).not_to have_content(other_merge_request.title) end - it 'shows authored merge requests', js: true do + it 'shows authored merge requests', :js do filter_item_select('Any Assignee', '.js-assignee-search') filter_item_select(current_user.to_reference, '.js-author-search') @@ -100,7 +101,7 @@ feature 'Dashboard Merge Requests' do expect(page).not_to have_content(other_merge_request.title) end - it 'shows all merge requests', js: true do + it 'shows all merge requests', :js do filter_item_select('Any Assignee', '.js-assignee-search') filter_item_select('Any Author', '.js-author-search') |