Merge branch 'fix-owner-remove-pages-message' into 'master'

Only show the message if user is not the owner

Closes #323

See merge request !628

app/views/projects/pages/_destroy.haml

-- if can?(current_user, :remove_pages, @project) && @project.pages_deployed?
-  .panel.panel-default.panel.panel-danger
-    .panel-heading Remove pages
-    .errors-holder
-    .panel-body
-      %p
-        Removing the pages will prevent from exposing them to outside world.
-      .form-actions
-        = link_to 'Remove pages', namespace_project_pages_path(@project.namespace, @project), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove"
-- else
-  .nothing-here-block Only the project owner can remove pages
+- if @project.pages_deployed?
+  - if can?(current_user, :remove_pages, @project)
+    .panel.panel-default.panel.panel-danger
+      .panel-heading Remove pages
+      .errors-holder
+      .panel-body
+        %p
+          Removing the pages will prevent from exposing them to outside world.
+        .form-actions
+          = link_to 'Remove pages', namespace_project_pages_path(@project.namespace, @project), data: { confirm: 'Are you sure?'}, method: :delete, class: "btn btn-remove"
+  - else
+    .nothing-here-block Only the project owner can remove pages

spec/features/projects/pages_spec.rb

+require 'spec_helper'
+
+feature 'Pages', feature: true do
+  given(:project) { create(:empty_project) }
+  given(:user) { create(:user) }
+  given(:role) { :master }
+
+  background do
+    allow(Gitlab.config.pages).to receive(:enabled).and_return(true)
+
+    project.team << [user, role]
+
+    login_as(user)
+  end
+
+  shared_examples 'no pages deployed' do
+    scenario 'does not see anything to destroy' do
+      visit namespace_project_pages_path(project.namespace, project)
+
+      expect(page).not_to have_link('Remove pages')
+      expect(page).not_to have_text('Only the project owner can remove pages')
+    end
+  end
+
+  context 'when user is the owner' do
+    background do
+      project.namespace.update(owner: user)
+    end
+
+    context 'when pages deployed' do
+      background do
+        allow_any_instance_of(Project).to receive(:pages_deployed?) { true }
+      end
+
+      scenario 'sees "Remove pages" link' do
+        visit namespace_project_pages_path(project.namespace, project)
+
+        expect(page).to have_link('Remove pages')
+      end
+    end
+
+    it_behaves_like 'no pages deployed'
+  end
+
+  context 'when the user is not the owner' do
+    context 'when pages deployed' do
+      background do
+        allow_any_instance_of(Project).to receive(:pages_deployed?) { true }
+      end
+
+      scenario 'sees "Only the project owner can remove pages" text' do
+        visit namespace_project_pages_path(project.namespace, project)
+
+        expect(page).to have_text('Only the project owner can remove pages')
+      end
+    end
+
+    it_behaves_like 'no pages deployed'
+  end
+end