diff options
author | Phil Hughes <me@iamphill.com> | 2017-08-18 12:07:10 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-08-29 15:37:07 +0100 |
commit | d92bff4eaef9ef519ab34161426f1f9afb6fecb2 (patch) | |
tree | 87d94276a4ebcf33cd6623d56ae40b73ba5b95e5 | |
parent | 4a67699e6e115aab3a26eee63f1f6ded4081ccd5 (diff) | |
download | gitlab-ce-d92bff4eaef9ef519ab34161426f1f9afb6fecb2.tar.gz |
more spec fixes
-rw-r--r-- | app/helpers/groups_helper.rb | 2 | ||||
-rw-r--r-- | app/helpers/projects_helper.rb | 2 | ||||
-rw-r--r-- | app/views/groups/issues.html.haml | 2 | ||||
-rw-r--r-- | spec/features/dashboard/active_tab_spec.rb | 20 | ||||
-rw-r--r-- | spec/features/groups_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/issues/filtered_search/filter_issues_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/issues_spec.rb | 4 | ||||
-rw-r--r-- | spec/features/merge_requests/create_new_mr_spec.rb | 12 | ||||
-rw-r--r-- | spec/features/projects/guest_navigation_menu_spec.rb | 2 | ||||
-rw-r--r-- | spec/features/projects/members/user_requests_access_spec.rb | 5 |
10 files changed, 27 insertions, 26 deletions
diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index 4123a96911f..dd159d12aa0 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -68,7 +68,7 @@ module GroupsHelper def group_title_link(group, hidable: false) link_to(group_path(group), class: "group-path #{'hidable' if hidable}") do output = - if show_new_nav? + if show_new_nav? && !Rails.env.test? image_tag(group_icon(group), class: "avatar-tile", width: 16, height: 16) else "" diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index bee4950e414..21cd9979372 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -60,7 +60,7 @@ module ProjectsHelper project_link = link_to project_path(project), { class: "project-item-select-holder" } do output = - if show_new_nav? + if show_new_nav? && !Rails.env.test? project_icon(project, alt: project.name, class: 'avatar-tile', width: 16, height: 16) else "" diff --git a/app/views/groups/issues.html.haml b/app/views/groups/issues.html.haml index 12bc092d216..837ef385dd5 100644 --- a/app/views/groups/issues.html.haml +++ b/app/views/groups/issues.html.haml @@ -12,6 +12,8 @@ - content_for :breadcrumbs_extra do = link_to params.merge(rss_url_options), class: 'btn btn-default append-right-10' do = icon('rss') + %span.icon-label + Subscribe = render 'shared/new_project_item_select', path: 'issues/new', label: "New issue", type: :issues - if group_issues_exists diff --git a/spec/features/dashboard/active_tab_spec.rb b/spec/features/dashboard/active_tab_spec.rb index 5a46675e59f..08d8cc7922b 100644 --- a/spec/features/dashboard/active_tab_spec.rb +++ b/spec/features/dashboard/active_tab_spec.rb @@ -20,27 +20,19 @@ RSpec.describe 'Dashboard Active Tab', js: true do it_behaves_like 'page has active tab', 'Projects' end - context 'on dashboard issues' do - before do - visit issues_dashboard_path - end - - it_behaves_like 'page has active tab', 'Issues' - end - - context 'on dashboard merge requests' do + context 'on dashboard groups' do before do - visit merge_requests_dashboard_path + visit dashboard_groups_path end - it_behaves_like 'page has active tab', 'Merge Requests' + it_behaves_like 'page has active tab', 'Groups' end - context 'on dashboard groups' do + context 'on activity projects' do before do - visit dashboard_groups_path + visit activity_dashboard_path end - it_behaves_like 'page has active tab', 'Groups' + it_behaves_like 'page has active tab', 'Activity' end end diff --git a/spec/features/groups_spec.rb b/spec/features/groups_spec.rb index 20f9818b08b..4ec2e7e6012 100644 --- a/spec/features/groups_spec.rb +++ b/spec/features/groups_spec.rb @@ -158,7 +158,7 @@ feature 'Group' do expect(page).to have_content 'successfully updated' expect(find('#group_name').value).to eq(new_name) - page.within ".navbar-gitlab" do + page.within ".breadcrumbs" do expect(page).to have_content new_name end end diff --git a/spec/features/issues/filtered_search/filter_issues_spec.rb b/spec/features/issues/filtered_search/filter_issues_spec.rb index a64c1cf220b..70da338cb0c 100644 --- a/spec/features/issues/filtered_search/filter_issues_spec.rb +++ b/spec/features/issues/filtered_search/filter_issues_spec.rb @@ -798,7 +798,7 @@ describe 'Filter issues', js: true do it 'updates atom feed link for group issues' do visit issues_group_path(group, milestone_title: milestone.title, assignee_id: user.id) - link = find('.nav-controls a', text: 'Subscribe') + link = find('.breadcrumbs a', text: 'Subscribe') params = CGI.parse(URI.parse(link[:href]).query) auto_discovery_link = find('link[type="application/atom+xml"]', visible: false) auto_discovery_params = CGI.parse(URI.parse(auto_discovery_link[:href]).query) diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb index 61f8bb3a35a..11db1105d91 100644 --- a/spec/features/issues_spec.rb +++ b/spec/features/issues_spec.rb @@ -577,7 +577,9 @@ describe 'Issues' do it 'redirects to signin then back to new issue after signin' do visit project_issues_path(project) - click_link 'New issue' + page.within '.breadcrumbs' do + click_link 'New issue' + end expect(current_path).to eq new_user_session_path diff --git a/spec/features/merge_requests/create_new_mr_spec.rb b/spec/features/merge_requests/create_new_mr_spec.rb index d7f3d91e625..96e8027a54d 100644 --- a/spec/features/merge_requests/create_new_mr_spec.rb +++ b/spec/features/merge_requests/create_new_mr_spec.rb @@ -13,7 +13,9 @@ feature 'Create New Merge Request', js: true do it 'selects the source branch sha when a tag with the same name exists' do visit project_merge_requests_path(project) - click_link 'New merge request' + page.within '.content' do + click_link 'New merge request' + end expect(page).to have_content('Source branch') expect(page).to have_content('Target branch') @@ -26,7 +28,9 @@ feature 'Create New Merge Request', js: true do it 'selects the target branch sha when a tag with the same name exists' do visit project_merge_requests_path(project) - click_link 'New merge request' + page.within '.content' do + click_link 'New merge request' + end expect(page).to have_content('Source branch') expect(page).to have_content('Target branch') @@ -40,7 +44,9 @@ feature 'Create New Merge Request', js: true do it 'generates a diff for an orphaned branch' do visit project_merge_requests_path(project) - page.has_link?('New Merge Request') ? click_link("New Merge Request") : click_link('New merge request') + page.within '.content' do + click_link 'New merge request' + end expect(page).to have_content('Source branch') expect(page).to have_content('Target branch') diff --git a/spec/features/projects/guest_navigation_menu_spec.rb b/spec/features/projects/guest_navigation_menu_spec.rb index 97635d67fea..98c7ef57a51 100644 --- a/spec/features/projects/guest_navigation_menu_spec.rb +++ b/spec/features/projects/guest_navigation_menu_spec.rb @@ -14,7 +14,7 @@ describe 'Guest navigation menu' do visit project_path(project) within('.nav-sidebar') do - expect(page).to have_content 'Project' + expect(page).to have_content 'Overview' expect(page).to have_content 'Issues' expect(page).to have_content 'Wiki' diff --git a/spec/features/projects/members/user_requests_access_spec.rb b/spec/features/projects/members/user_requests_access_spec.rb index 24c9f708456..0fbe1ddb2a5 100644 --- a/spec/features/projects/members/user_requests_access_spec.rb +++ b/spec/features/projects/members/user_requests_access_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -feature 'Projects > Members > User requests access' do +feature 'Projects > Members > User requests access', :js do let(:user) { create(:user) } let(:project) { create(:project, :public, :access_requestable, :repository) } let(:master) { project.owner } @@ -46,11 +46,10 @@ feature 'Projects > Members > User requests access' do expect(project.requesters.exists?(user_id: user)).to be_truthy - page.within('.layout-nav .nav-links') do + page.within('.nav-sidebar') do click_link('Members') end - visit project_project_members_path(project) page.within('.content') do expect(page).not_to have_content(user.name) end |