more navigation spec fixes
This commit is contained in:
parent
aab5d55090
commit
25a3b7fab9
3 changed files with 7 additions and 7 deletions
|
@ -36,13 +36,13 @@ class Spinach::Features::ExploreProjects < Spinach::FeatureSteps
|
||||||
end
|
end
|
||||||
|
|
||||||
step 'I should see project "Community" home page' do
|
step 'I should see project "Community" home page' do
|
||||||
page.within '.navbar-gitlab .title' do
|
page.within '.breadcrumbs .title' do
|
||||||
expect(page).to have_content 'Community'
|
expect(page).to have_content 'Community'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
step 'I should see project "Internal" home page' do
|
step 'I should see project "Internal" home page' do
|
||||||
page.within '.navbar-gitlab .title' do
|
page.within '.breadcrumbs .title' do
|
||||||
expect(page).to have_content 'Internal'
|
expect(page).to have_content 'Internal'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -34,13 +34,13 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps
|
||||||
end
|
end
|
||||||
|
|
||||||
step 'I click the "Repository" tab' do
|
step 'I click the "Repository" tab' do
|
||||||
page.within '.nav-sidebar' do
|
page.within '.sidebar-top-level-items > .active' do
|
||||||
click_link('Repository')
|
click_link('Repository')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
step 'I click the "Activity" tab' do
|
step 'I click the "Activity" tab' do
|
||||||
page.within '.nav-sidebar' do
|
page.within '.sidebar-top-level-items > .active' do
|
||||||
click_link('Activity')
|
click_link('Activity')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -82,7 +82,7 @@ class Spinach::Features::ProjectActiveTab < Spinach::FeatureSteps
|
||||||
end
|
end
|
||||||
|
|
||||||
step 'I click the "Charts" tab' do
|
step 'I click the "Charts" tab' do
|
||||||
page.within '.nav-sidebar' do
|
page.within('.sidebar-top-level-items > .active') do
|
||||||
click_link('Charts')
|
click_link('Charts')
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -6,6 +6,8 @@ feature 'Merge requests > User posts diff notes', :js do
|
||||||
let(:project) { merge_request.source_project }
|
let(:project) { merge_request.source_project }
|
||||||
|
|
||||||
before do
|
before do
|
||||||
|
allow_any_instance_of(ApplicationHelper).to receive(:collapsed_sidebar?).and_return(true)
|
||||||
|
|
||||||
project.add_developer(user)
|
project.add_developer(user)
|
||||||
sign_in(user)
|
sign_in(user)
|
||||||
end
|
end
|
||||||
|
@ -17,8 +19,6 @@ feature 'Merge requests > User posts diff notes', :js do
|
||||||
|
|
||||||
context 'when hovering over a parallel view diff file' do
|
context 'when hovering over a parallel view diff file' do
|
||||||
before do
|
before do
|
||||||
allow_any_instance_of(ApplicationHelper).to receive(:collapsed_sidebar?).and_return(true)
|
|
||||||
|
|
||||||
visit diffs_project_merge_request_path(project, merge_request, view: 'parallel')
|
visit diffs_project_merge_request_path(project, merge_request, view: 'parallel')
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue