summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>2015-12-28 10:36:35 -0500
committerJacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>2015-12-28 14:45:23 -0500
commit8ee6abaaf472d7d4562d3c718ad1a68ceb71631f (patch)
tree52613c9715da71120b3350d9efa5e0b34e9d8e84
parenteb162c2b2741bfd1ea8dd1b49e12027f7ed03594 (diff)
downloadgitlab-ce-8ee6abaaf472d7d4562d3c718ad1a68ceb71631f.tar.gz
fixes tests failing
-rw-r--r--app/views/projects/_home_panel.html.haml4
-rw-r--r--spec/features/projects_spec.rb5
2 files changed, 6 insertions, 3 deletions
diff --git a/app/views/projects/_home_panel.html.haml b/app/views/projects/_home_panel.html.haml
index c3f710fa3fb..0f61e623396 100644
--- a/app/views/projects/_home_panel.html.haml
+++ b/app/views/projects/_home_panel.html.haml
@@ -25,7 +25,7 @@
- can_edit = can?(current_user, :admin_project, @project)
- if access || can_edit
%span.dropdown.project-settings-dropdown
- %a.dropdown-new.btn.btn-gray.notifications-btn#notifications-button{href: '#', 'data-toggle' => 'dropdown'}
+ %a.dropdown-new.btn.btn-gray#project-settings-button{href: '#', 'data-toggle' => 'dropdown'}
= icon('cog')
= icon('angle-down')
%ul.dropdown-menu.dropdown-menu-right
@@ -37,7 +37,7 @@
%li
= link_to leave_namespace_project_project_members_path(@project.namespace, @project),
data: { confirm: leave_project_message(@project) }, method: :delete, title: 'Leave project' do
- Leave project
+ Leave Project
.project-repo-buttons
.split-one.count-buttons
diff --git a/spec/features/projects_spec.rb b/spec/features/projects_spec.rb
index 74b148f5d17..d4a92072a94 100644
--- a/spec/features/projects_spec.rb
+++ b/spec/features/projects_spec.rb
@@ -81,7 +81,10 @@ feature 'Project', feature: true do
end
it { expect(page).to have_content('You have Master access to this project.') }
- it { expect(page).to have_link('Leave this project') }
+ it {
+ find('#project-settings').click
+ expect(page).to have_link('Leave Project')
+ }
end
def remove_with_confirm(button_text, confirm_with)