Merge branch 'master' into snake-casesnake-case

13 files changed, 204 insertions, 92 deletions

diff --git a/spec/features/projects/badges/coverage_spec.rb b/spec/features/projects/badges/coverage_spec.rb
index 821ce88a402..f51001edcd7 100644
--- a/spec/features/projects/badges/coverage_spec.rb
+++ b/spec/features/projects/badges/coverage_spec.rb
@@ -18,7 +18,7 @@ feature 'test coverage badge' do
 
       show_test_coverage_badge
 
-      expect_coverage_badge('95%')
+      expect_coverage_badge('95.00%')
     end
 
     scenario 'user requests coverage badge for specific job' do
@@ -30,7 +30,7 @@ feature 'test coverage badge' do
 
       show_test_coverage_badge(job: 'coverage')
 
-      expect_coverage_badge('85%')
+      expect_coverage_badge('85.00%')
     end
 
     scenario 'user requests coverage badge for pipeline without coverage' do
diff --git a/spec/features/projects/blobs/edit_spec.rb b/spec/features/projects/blobs/edit_spec.rb
index 69e4c9f04a1..89d3bd24b89 100644
--- a/spec/features/projects/blobs/edit_spec.rb
+++ b/spec/features/projects/blobs/edit_spec.rb
@@ -17,12 +17,15 @@ feature 'Editing file blob', :js do
       sign_in(user)
     end
 
-    def edit_and_commit
+    def edit_and_commit(commit_changes: true)
       wait_for_requests
       find('.js-edit-blob').click
       find('#editor')
       execute_script('ace.edit("editor").setValue("class NextFeature\nend\n")')
-      click_button 'Commit changes'
+
+      if commit_changes
+        click_button 'Commit changes'
+      end
     end
 
     context 'from MR diff' do
@@ -39,13 +42,26 @@ feature 'Editing file blob', :js do
     context 'from blob file path' do
       before do
         visit project_blob_path(project, tree_join(branch, file_path))
-        edit_and_commit
       end
 
       it 'updates content' do
+        edit_and_commit
+
         expect(page).to have_content 'successfully committed'
         expect(page).to have_content 'NextFeature'
       end
+
+      it 'previews content' do
+        edit_and_commit(commit_changes: false)
+        click_link 'Preview changes'
+        wait_for_requests
+
+        old_line_count = page.all('.line_holder.old').size
+        new_line_count = page.all('.line_holder.new').size
+
+        expect(old_line_count).to be > 0
+        expect(new_line_count).to be > 0
+      end
     end
   end
 
diff --git a/spec/features/projects/clusters/applications_spec.rb b/spec/features/projects/clusters/applications_spec.rb
index 9c4abec115f..8d1e10b7191 100644
--- a/spec/features/projects/clusters/applications_spec.rb
+++ b/spec/features/projects/clusters/applications_spec.rb
@@ -64,7 +64,7 @@ feature 'Clusters Applications', :js do
             expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Installed')
           end
 
-          expect(page).to have_content('Helm Tiller was successfully installed on your cluster')
+          expect(page).to have_content('Helm Tiller was successfully installed on your Kubernetes cluster')
         end
       end
 
@@ -98,7 +98,7 @@ feature 'Clusters Applications', :js do
               expect(page.find(:css, '.js-cluster-application-install-button')).to have_content('Installed')
             end
 
-            expect(page).to have_content('Ingress was successfully installed on your cluster')
+            expect(page).to have_content('Ingress was successfully installed on your Kubernetes cluster')
           end
         end
       end
diff --git a/spec/features/projects/clusters/gcp_spec.rb b/spec/features/projects/clusters/gcp_spec.rb
index 8953b30bebf..02dbd3380b3 100644
--- a/spec/features/projects/clusters/gcp_spec.rb
+++ b/spec/features/projects/clusters/gcp_spec.rb
@@ -32,7 +32,7 @@ feature 'Gcp Cluster', :js do
         before do
           visit project_clusters_path(project)
 
-          click_link 'Add cluster'
+          click_link 'Add Kubernetes cluster'
           click_link 'Create on GKE'
         end
 
@@ -50,19 +50,19 @@ feature 'Gcp Cluster', :js do
 
             fill_in 'cluster_provider_gcp_attributes_gcp_project_id', with: 'gcp-project-123'
             fill_in 'cluster_name', with: 'dev-cluster'
-            click_button 'Create cluster'
+            click_button 'Create Kubernetes cluster'
           end
 
           it 'user sees a cluster details page and creation status' do
-            expect(page).to have_content('Cluster is being created on Google Kubernetes Engine...')
+            expect(page).to have_content('Kubernetes cluster is being created on Google Kubernetes Engine...')
 
             Clusters::Cluster.last.provider.make_created!
 
-            expect(page).to have_content('Cluster was successfully created on Google Kubernetes Engine')
+            expect(page).to have_content('Kubernetes cluster was successfully created on Google Kubernetes Engine')
           end
 
           it 'user sees a error if something worng during creation' do
-            expect(page).to have_content('Cluster is being created on Google Kubernetes Engine...')
+            expect(page).to have_content('Kubernetes cluster is being created on Google Kubernetes Engine...')
 
             Clusters::Cluster.last.provider.make_errored!('Something wrong!')
 
@@ -72,7 +72,7 @@ feature 'Gcp Cluster', :js do
 
         context 'when user filled form with invalid parameters' do
           before do
-            click_button 'Create cluster'
+            click_button 'Create Kubernetes cluster'
           end
 
           it 'user sees a validation error' do
@@ -95,12 +95,12 @@ feature 'Gcp Cluster', :js do
 
         context 'when user disables the cluster' do
           before do
-            page.find(:css, '.js-toggle-cluster').click
+            page.find(:css, '.js-cluster-enable-toggle-area .js-project-feature-toggle').click
             page.within('#cluster-integration') { click_button 'Save changes' }
           end
 
           it 'user sees the successful message' do
-            expect(page).to have_content('Cluster was successfully updated.')
+            expect(page).to have_content('Kubernetes cluster was successfully updated.')
           end
         end
 
@@ -111,7 +111,7 @@ feature 'Gcp Cluster', :js do
           end
 
           it 'user sees the successful message' do
-            expect(page).to have_content('Cluster was successfully updated.')
+            expect(page).to have_content('Kubernetes cluster was successfully updated.')
             expect(cluster.reload.platform_kubernetes.namespace).to eq('my-namespace')
           end
         end
@@ -124,8 +124,8 @@ feature 'Gcp Cluster', :js do
           end
 
           it 'user sees creation form with the successful message' do
-            expect(page).to have_content('Cluster integration was successfully removed.')
-            expect(page).to have_link('Add cluster')
+            expect(page).to have_content('Kubernetes cluster integration was successfully removed.')
+            expect(page).to have_link('Add Kubernetes cluster')
           end
         end
       end
@@ -138,16 +138,16 @@ feature 'Gcp Cluster', :js do
 
         visit project_clusters_path(project)
 
-        click_link 'Add cluster'
+        click_link 'Add Kubernetes cluster'
         click_link 'Create on GKE'
 
         fill_in 'cluster_provider_gcp_attributes_gcp_project_id', with: 'gcp-project-123'
         fill_in 'cluster_name', with: 'dev-cluster'
-        click_button 'Create cluster'
+        click_button 'Create Kubernetes cluster'
       end
 
       it 'user sees form with error' do
-        expect(page).to have_content('Please enable billing for one of your projects to be able to create a cluster, then try again.')
+        expect(page).to have_content('Please enable billing for one of your projects to be able to create a Kubernetes cluster, then try again.')
       end
     end
 
@@ -158,12 +158,12 @@ feature 'Gcp Cluster', :js do
 
         visit project_clusters_path(project)
 
-        click_link 'Add cluster'
+        click_link 'Add Kubernetes cluster'
         click_link 'Create on GKE'
 
         fill_in 'cluster_provider_gcp_attributes_gcp_project_id', with: 'gcp-project-123'
         fill_in 'cluster_name', with: 'dev-cluster'
-        click_button 'Create cluster'
+        click_button 'Create Kubernetes cluster'
       end
 
       it 'user sees form with error' do
@@ -176,7 +176,7 @@ feature 'Gcp Cluster', :js do
     before do
       visit project_clusters_path(project)
 
-      click_link 'Add cluster'
+      click_link 'Add Kubernetes cluster'
       click_link 'Create on GKE'
     end
 
diff --git a/spec/features/projects/clusters/user_spec.rb b/spec/features/projects/clusters/user_spec.rb
index a519b9f9c7e..698b64a659c 100644
--- a/spec/features/projects/clusters/user_spec.rb
+++ b/spec/features/projects/clusters/user_spec.rb
@@ -16,8 +16,8 @@ feature 'User Cluster', :js do
     before do
       visit project_clusters_path(project)
 
-      click_link 'Add cluster'
-      click_link 'Add an existing cluster'
+      click_link 'Add Kubernetes cluster'
+      click_link 'Add an existing Kubernetes cluster'
     end
 
     context 'when user filled form with valid parameters' do
@@ -25,11 +25,11 @@ feature 'User Cluster', :js do
         fill_in 'cluster_name', with: 'dev-cluster'
         fill_in 'cluster_platform_kubernetes_attributes_api_url', with: 'http://example.com'
         fill_in 'cluster_platform_kubernetes_attributes_token', with: 'my-token'
-        click_button 'Add cluster'
+        click_button 'Add Kubernetes cluster'
       end
 
       it 'user sees a cluster details page' do
-        expect(page).to have_content('Cluster integration')
+        expect(page).to have_content('Kubernetes cluster integration')
         expect(page.find_field('cluster[name]').value).to eq('dev-cluster')
         expect(page.find_field('cluster[platform_kubernetes_attributes][api_url]').value)
           .to have_content('http://example.com')
@@ -40,7 +40,7 @@ feature 'User Cluster', :js do
 
     context 'when user filled form with invalid parameters' do
       before do
-        click_button 'Add cluster'
+        click_button 'Add Kubernetes cluster'
       end
 
       it 'user sees a validation error' do
@@ -62,13 +62,13 @@ feature 'User Cluster', :js do
 
     context 'when user disables the cluster' do
       before do
-        page.find(:css, '.js-toggle-cluster').click
+        page.find(:css, '.js-cluster-enable-toggle-area .js-project-feature-toggle').click
         fill_in 'cluster_name', with: 'dev-cluster'
         page.within('#cluster-integration') { click_button 'Save changes' }
       end
 
       it 'user sees the successful message' do
-        expect(page).to have_content('Cluster was successfully updated.')
+        expect(page).to have_content('Kubernetes cluster was successfully updated.')
       end
     end
 
@@ -80,7 +80,7 @@ feature 'User Cluster', :js do
       end
 
       it 'user sees the successful message' do
-        expect(page).to have_content('Cluster was successfully updated.')
+        expect(page).to have_content('Kubernetes cluster was successfully updated.')
         expect(cluster.reload.name).to eq('my-dev-cluster')
         expect(cluster.reload.platform_kubernetes.namespace).to eq('my-namespace')
       end
@@ -94,8 +94,8 @@ feature 'User Cluster', :js do
       end
 
       it 'user sees creation form with the successful message' do
-        expect(page).to have_content('Cluster integration was successfully removed.')
-        expect(page).to have_link('Add cluster')
+        expect(page).to have_content('Kubernetes cluster integration was successfully removed.')
+        expect(page).to have_link('Add Kubernetes cluster')
       end
     end
   end
diff --git a/spec/features/projects/clusters_spec.rb b/spec/features/projects/clusters_spec.rb
index eae2910a8f6..bd9f7745cf8 100644
--- a/spec/features/projects/clusters_spec.rb
+++ b/spec/features/projects/clusters_spec.rb
@@ -17,7 +17,7 @@ feature 'Clusters', :js do
     end
 
     it 'sees empty state' do
-      expect(page).to have_link('Add cluster')
+      expect(page).to have_link('Add Kubernetes cluster')
       expect(page).to have_selector('.empty-state')
     end
   end
@@ -37,13 +37,13 @@ feature 'Clusters', :js do
 
     context 'inline update of cluster' do
       it 'user can update cluster' do
-        expect(page).to have_selector('.js-toggle-cluster-list')
+        expect(page).to have_selector('.js-project-feature-toggle')
       end
 
       context 'with sucessfull request' do
         it 'user sees updated cluster' do
           expect do
-            page.find('.js-toggle-cluster-list').click
+            page.find('.js-project-feature-toggle').click
             wait_for_requests
           end.to change { cluster.reload.enabled }
 
@@ -57,7 +57,7 @@ feature 'Clusters', :js do
           expect_any_instance_of(Clusters::UpdateService).to receive(:execute).and_call_original
           allow_any_instance_of(Clusters::Cluster).to receive(:valid?) { false }
 
-          page.find('.js-toggle-cluster-list').click
+          page.find('.js-project-feature-toggle').click
 
           expect(page).to have_content('Something went wrong on our end.')
           expect(page).to have_selector('.is-checked')
@@ -82,7 +82,7 @@ feature 'Clusters', :js do
     before do
       visit project_clusters_path(project)
 
-      click_link 'Add cluster'
+      click_link 'Add Kubernetes cluster'
       click_link 'Create on GKE'
     end
 
diff --git a/spec/features/projects/import_export/namespace_export_file_spec.rb b/spec/features/projects/import_export/namespace_export_file_spec.rb
index e76bc6f1220..c1fccf4a40b 100644
--- a/spec/features/projects/import_export/namespace_export_file_spec.rb
+++ b/spec/features/projects/import_export/namespace_export_file_spec.rb
@@ -1,44 +1,37 @@
 require 'spec_helper'
 
 feature 'Import/Export - Namespace export file cleanup', :js do
-  let(:export_path) { "#{Dir.tmpdir}/import_file_spec" }
-  let(:config_hash) { YAML.load_file(Gitlab::ImportExport.config_file).deep_stringify_keys }
+  let(:export_path) { Dir.mktmpdir('namespace_export_file_spec') }
 
-  let(:project) { create(:project) }
-
-  background do
-    allow_any_instance_of(Gitlab::ImportExport).to receive(:storage_path).and_return(export_path)
+  before do
+    allow(Gitlab::ImportExport).to receive(:storage_path).and_return(export_path)
   end
 
   after do
     FileUtils.rm_rf(export_path, secure: true)
   end
 
-  context 'admin user' do
+  shared_examples_for 'handling project exports on namespace change' do
+    let!(:old_export_path) { project.export_path }
+
     before do
       sign_in(create(:admin))
+
+      setup_export_project
     end
 
     context 'moving the namespace' do
-      scenario 'removes the export file' do
-        setup_export_project
-
-        old_export_path = project.export_path.dup
-
+      it 'removes the export file' do
         expect(File).to exist(old_export_path)
 
-        project.namespace.update(path: 'new_path')
+        project.namespace.update!(path: build(:namespace).path)
 
         expect(File).not_to exist(old_export_path)
       end
     end
 
     context 'deleting the namespace' do
-      scenario 'removes the export file' do
-        setup_export_project
-
-        old_export_path = project.export_path.dup
-
+      it 'removes the export file' do
         expect(File).to exist(old_export_path)
 
         project.namespace.destroy
@@ -46,17 +39,29 @@ feature 'Import/Export - Namespace export file cleanup', :js do
         expect(File).not_to exist(old_export_path)
       end
     end
+  end
 
-    def setup_export_project
-      visit edit_project_path(project)
+  describe 'legacy storage' do
+    let(:project) { create(:project) }
 
-      expect(page).to have_content('Export project')
+    it_behaves_like 'handling project exports on namespace change'
+  end
+
+  describe 'hashed storage' do
+    let(:project) { create(:project, :hashed) }
 
-      find(:link, 'Export project').send_keys(:return)
+    it_behaves_like 'handling project exports on namespace change'
+  end
 
-      visit edit_project_path(project)
+  def setup_export_project
+    visit edit_project_path(project)
 
-      expect(page).to have_content('Download export')
-    end
+    expect(page).to have_content('Export project')
+
+    find(:link, 'Export project').send_keys(:return)
+
+    visit edit_project_path(project)
+
+    expect(page).to have_content('Download export')
   end
 end
diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb
index e661db1809a..5d311f2dde3 100644
--- a/spec/features/projects/jobs_spec.rb
+++ b/spec/features/projects/jobs_spec.rb
@@ -7,7 +7,7 @@ feature 'Jobs' do
   let(:project) { create(:project, :repository) }
   let(:pipeline) { create(:ci_pipeline, project: project) }
 
-  let(:job) { create(:ci_build, :trace, pipeline: pipeline) }
+  let(:job) { create(:ci_build, :trace_live, pipeline: pipeline) }
   let(:job2) { create(:ci_build) }
 
   let(:artifacts_file) do
@@ -490,18 +490,34 @@ feature 'Jobs' do
   describe 'GET /:project/jobs/:id/raw', :js do
     context 'access source' do
       context 'job from project' do
-        before do
-          job.run!
-        end
+        context 'when job is running' do
+          before do
+            job.run!
+          end
 
-        it 'sends the right headers' do
-          requests = inspect_requests(inject_headers: { 'X-Sendfile-Type' => 'X-Sendfile' }) do
-            visit raw_project_job_path(project, job)
+          it 'sends the right headers' do
+            requests = inspect_requests(inject_headers: { 'X-Sendfile-Type' => 'X-Sendfile' }) do
+              visit raw_project_job_path(project, job)
+            end
+
+            expect(requests.first.status_code).to eq(200)
+            expect(requests.first.response_headers['Content-Type']).to eq('text/plain; charset=utf-8')
+            expect(requests.first.response_headers['X-Sendfile']).to eq(job.trace.send(:current_path))
           end
+        end
 
-          expect(requests.first.status_code).to eq(200)
-          expect(requests.first.response_headers['Content-Type']).to eq('text/plain; charset=utf-8')
-          expect(requests.first.response_headers['X-Sendfile']).to eq(job.trace.send(:current_path))
+        context 'when job is complete' do
+          let(:job) { create(:ci_build, :success, :trace_artifact, pipeline: pipeline) }
+
+          it 'sends the right headers' do
+            requests = inspect_requests(inject_headers: { 'X-Sendfile-Type' => 'X-Sendfile' }) do
+              visit raw_project_job_path(project, job)
+            end
+
+            expect(requests.first.status_code).to eq(200)
+            expect(requests.first.response_headers['Content-Type']).to eq('text/plain; charset=utf-8')
+            expect(requests.first.response_headers['X-Sendfile']).to eq(job.job_artifacts_trace.file.path)
+          end
         end
       end
 
diff --git a/spec/features/projects/labels/update_prioritization_spec.rb b/spec/features/projects/labels/update_prioritization_spec.rb
index 85bd776932b..ae8b1364ec7 100644
--- a/spec/features/projects/labels/update_prioritization_spec.rb
+++ b/spec/features/projects/labels/update_prioritization_spec.rb
@@ -99,7 +99,7 @@ feature 'Prioritize labels' do
       expect(page).to have_content 'wontfix'
 
       # Sort labels
-      drag_to(selector: '.js-prioritized-labels', from_index: 1, to_index: 2)
+      drag_to(selector: '.label-list-item', from_index: 1, to_index: 2)
 
       page.within('.prioritized-labels') do
         expect(first('li')).to have_content('feature')
diff --git a/spec/features/projects/members/share_with_group_spec.rb b/spec/features/projects/members/share_with_group_spec.rb
index 3198798306c..4cf48098401 100644
--- a/spec/features/projects/members/share_with_group_spec.rb
+++ b/spec/features/projects/members/share_with_group_spec.rb
@@ -122,7 +122,7 @@ feature 'Project > Members > Share with Group', :js do
       select2 group.id, from: '#link_group_id'
 
       fill_in 'expires_at_groups', with: (Time.now + 4.5.days).strftime('%Y-%m-%d')
-      page.find('body').click
+      click_on 'share-with-group-tab'
       find('.btn-create').click
     end
 
diff --git a/spec/features/projects/pipeline_schedules_spec.rb b/spec/features/projects/pipeline_schedules_spec.rb
index fa2f7a1fd78..65e24862d43 100644
--- a/spec/features/projects/pipeline_schedules_spec.rb
+++ b/spec/features/projects/pipeline_schedules_spec.rb
@@ -168,11 +168,11 @@ feature 'Pipeline Schedules', :js do
 
       scenario 'user sees the new variable in edit window' do
         find(".content-list .pipeline-schedule-table-row:nth-child(1) .btn-group a[title='Edit']").click
-        page.within('.pipeline-variable-list') do
-          expect(find(".pipeline-variable-row:nth-child(1) .pipeline-variable-key-input").value).to eq('AAA')
-          expect(find(".pipeline-variable-row:nth-child(1) .pipeline-variable-value-input").value).to eq('AAA123')
-          expect(find(".pipeline-variable-row:nth-child(2) .pipeline-variable-key-input").value).to eq('BBB')
-          expect(find(".pipeline-variable-row:nth-child(2) .pipeline-variable-value-input").value).to eq('BBB123')
+        page.within('.ci-variable-list') do
+          expect(find(".ci-variable-row:nth-child(1) .js-ci-variable-input-key").value).to eq('AAA')
+          expect(find(".ci-variable-row:nth-child(1) .js-ci-variable-input-value", visible: false).value).to eq('AAA123')
+          expect(find(".ci-variable-row:nth-child(2) .js-ci-variable-input-key").value).to eq('BBB')
+          expect(find(".ci-variable-row:nth-child(2) .js-ci-variable-input-value", visible: false).value).to eq('BBB123')
         end
       end
     end
@@ -185,16 +185,18 @@ feature 'Pipeline Schedules', :js do
 
         visit_pipelines_schedules
         find(".content-list .pipeline-schedule-table-row:nth-child(1) .btn-group a[title='Edit']").click
-        all('[name="schedule[variables_attributes][][key]"]')[0].set('foo')
-        all('[name="schedule[variables_attributes][][value]"]')[0].set('bar')
+
+        find('.js-ci-variable-list-section .js-secret-value-reveal-button').click
+        first('.js-ci-variable-input-key').set('foo')
+        first('.js-ci-variable-input-value').set('bar')
         click_button 'Save pipeline schedule'
       end
 
       scenario 'user sees the updated variable in edit window' do
         find(".content-list .pipeline-schedule-table-row:nth-child(1) .btn-group a[title='Edit']").click
-        page.within('.pipeline-variable-list') do
-          expect(find(".pipeline-variable-row:nth-child(1) .pipeline-variable-key-input").value).to eq('foo')
-          expect(find(".pipeline-variable-row:nth-child(1) .pipeline-variable-value-input").value).to eq('bar')
+        page.within('.ci-variable-list') do
+          expect(find(".ci-variable-row:nth-child(1) .js-ci-variable-input-key").value).to eq('foo')
+          expect(find(".ci-variable-row:nth-child(1) .js-ci-variable-input-value", visible: false).value).to eq('bar')
         end
       end
     end
@@ -207,15 +209,15 @@ feature 'Pipeline Schedules', :js do
 
         visit_pipelines_schedules
         find(".content-list .pipeline-schedule-table-row:nth-child(1) .btn-group a[title='Edit']").click
-        find('.pipeline-variable-list .pipeline-variable-row-remove-button').click
+        find('.ci-variable-list .ci-variable-row-remove-button').click
         click_button 'Save pipeline schedule'
       end
 
       scenario 'user does not see the removed variable in edit window' do
         find(".content-list .pipeline-schedule-table-row:nth-child(1) .btn-group a[title='Edit']").click
-        page.within('.pipeline-variable-list') do
-          expect(find(".pipeline-variable-row:nth-child(1) .pipeline-variable-key-input").value).to eq('')
-          expect(find(".pipeline-variable-row:nth-child(1) .pipeline-variable-value-input").value).to eq('')
+        page.within('.ci-variable-list') do
+          expect(find(".ci-variable-row:nth-child(1) .js-ci-variable-input-key").value).to eq('')
+          expect(find(".ci-variable-row:nth-child(1) .js-ci-variable-input-value", visible: false).value).to eq('')
         end
       end
     end
diff --git a/spec/features/projects/wiki/user_updates_wiki_page_spec.rb b/spec/features/projects/wiki/user_updates_wiki_page_spec.rb
index 949d90a50ff..4d2a08afecc 100644
--- a/spec/features/projects/wiki/user_updates_wiki_page_spec.rb
+++ b/spec/features/projects/wiki/user_updates_wiki_page_spec.rb
@@ -1,6 +1,7 @@
 require 'spec_helper'
 
-describe 'User updates wiki page' do
+# Remove skip_gitaly_mock flag when gitaly_update_page implements moving pages
+describe 'User updates wiki page', :skip_gitaly_mock do
   let(:user) { create(:user) }
 
   before do
@@ -143,6 +144,7 @@ describe 'User updates wiki page' do
         expect(page).to have_field('wiki[message]', with: 'Update home')
 
         fill_in(:wiki_content, with: 'My awesome wiki!')
+
         click_button('Save changes')
 
         expect(page).to have_content('Home')
@@ -151,4 +153,74 @@ describe 'User updates wiki page' do
       end
     end
   end
+
+  context 'when the page is in a subdir' do
+    let!(:project) { create(:project, namespace: user.namespace) }
+    let(:project_wiki) { create(:project_wiki, project: project, user: project.creator) }
+    let(:page_name) { 'page_name' }
+    let(:page_dir) { "foo/bar/#{page_name}" }
+    let!(:wiki_page) { create(:wiki_page, wiki: project_wiki, attrs: { title: page_dir, content: 'Home page' }) }
+
+    before do
+      visit(project_wiki_edit_path(project, wiki_page))
+    end
+
+    it 'moves the page to the root folder' do
+      fill_in(:wiki_title, with: "/#{page_name}")
+
+      click_button('Save changes')
+
+      expect(current_path).to eq(project_wiki_path(project, page_name))
+    end
+
+    it 'moves the page to other dir' do
+      new_page_dir = "foo1/bar1/#{page_name}"
+
+      fill_in(:wiki_title, with: new_page_dir)
+
+      click_button('Save changes')
+
+      expect(current_path).to eq(project_wiki_path(project, new_page_dir))
+    end
+
+    it 'remains in the same place if title has not changed' do
+      original_path = project_wiki_path(project, wiki_page)
+
+      fill_in(:wiki_title, with: page_name)
+
+      click_button('Save changes')
+
+      expect(current_path).to eq(original_path)
+    end
+
+    it 'can be moved to a different dir with a different name' do
+      new_page_dir = "foo1/bar1/new_page_name"
+
+      fill_in(:wiki_title, with: new_page_dir)
+
+      click_button('Save changes')
+
+      expect(current_path).to eq(project_wiki_path(project, new_page_dir))
+    end
+
+    it 'can be renamed and moved to the root folder' do
+      new_name = 'new_page_name'
+
+      fill_in(:wiki_title, with: "/#{new_name}")
+
+      click_button('Save changes')
+
+      expect(current_path).to eq(project_wiki_path(project, new_name))
+    end
+
+    it 'squishes the title before creating the page' do
+      new_page_dir = "  foo1 /  bar1  /  #{page_name}  "
+
+      fill_in(:wiki_title, with: new_page_dir)
+
+      click_button('Save changes')
+
+      expect(current_path).to eq(project_wiki_path(project, "foo1/bar1/#{page_name}"))
+    end
+  end
 end
diff --git a/spec/features/projects/wiki/user_views_wiki_page_spec.rb b/spec/features/projects/wiki/user_views_wiki_page_spec.rb
index ff325aeadd3..e37436838fd 100644
--- a/spec/features/projects/wiki/user_views_wiki_page_spec.rb
+++ b/spec/features/projects/wiki/user_views_wiki_page_spec.rb
@@ -1,6 +1,7 @@
 require 'spec_helper'
 
-describe 'User views a wiki page' do
+# Remove skip_gitaly_mock flag when gitaly_update_page implements moving pages
+describe 'User views a wiki page', :skip_gitaly_mock do
   let(:user) { create(:user) }
   let(:project) { create(:project, namespace: user.namespace) }
   let(:wiki_page) do