Revert "Merge branch 'zj-improve-gitaly-pb' into 'master'"

This reverts merge request !23140

2 files changed, 271 insertions, 251 deletions

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 7ad7fec922a..2ce5ee0e87d 100644
--- a/spec/features/projects/wiki/user_updates_wiki_page_spec.rb
+++ b/spec/features/projects/wiki/user_updates_wiki_page_spec.rb
@@ -1,223 +1,233 @@
 require 'spec_helper'
 
 describe 'User updates wiki page' do
-  let(:user) { create(:user) }
+  shared_examples 'wiki page user update' do
+    let(:user) { create(:user) }
 
-  before do
-    project.add_maintainer(user)
-    sign_in(user)
-  end
-
-  context 'when wiki is empty' do
     before do
-      visit(project_wikis_path(project))
-      click_link "Create your first page"
+      project.add_maintainer(user)
+      sign_in(user)
     end
 
-    context 'in a user namespace' do
-      let(:project) { create(:project, :wiki_repo) }
+    context 'when wiki is empty' do
+      before do
+        visit(project_wikis_path(project))
+        click_link "Create your first page"
+      end
+
+      context 'in a user namespace' do
+        let(:project) { create(:project, :wiki_repo, namespace: user.namespace) }
 
-      it 'redirects back to the home edit page' do
-        page.within(:css, '.wiki-form .form-actions') do
-          click_on('Cancel')
+        it 'redirects back to the home edit page' do
+          page.within(:css, '.wiki-form .form-actions') do
+            click_on('Cancel')
+          end
+
+          expect(current_path).to eq project_wiki_path(project, :home)
         end
 
-        expect(current_path).to eq project_wiki_path(project, :home)
-      end
+        it 'updates a page that has a path', :js do
+          click_on('New page')
 
-      it 'updates a page that has a path', :js do
-        click_on('New page')
+          page.within('#modal-new-wiki') do
+            fill_in(:new_wiki_path, with: 'one/two/three-test')
+            click_on('Create page')
+          end
 
-        page.within('#modal-new-wiki') do
-          fill_in(:new_wiki_path, with: 'one/two/three-test')
-          click_on('Create page')
-        end
+          page.within '.wiki-form' do
+            fill_in(:wiki_content, with: 'wiki content')
+            click_on('Create page')
+          end
 
-        page.within '.wiki-form' do
-          fill_in(:wiki_content, with: 'wiki content')
-          click_on('Create page')
-        end
+          expect(current_path).to include('one/two/three-test')
+          expect(find('.wiki-pages')).to have_content('Three')
 
-        expect(current_path).to include('one/two/three-test')
-        expect(find('.wiki-pages')).to have_content('Three')
+          first(:link, text: 'Three').click
 
-        first(:link, text: 'Three').click
+          expect(find('.nav-text')).to have_content('Three')
 
-        expect(find('.nav-text')).to have_content('Three')
+          click_on('Edit')
 
-        click_on('Edit')
+          expect(current_path).to include('one/two/three-test')
+          expect(page).to have_content('Edit Page')
 
-        expect(current_path).to include('one/two/three-test')
-        expect(page).to have_content('Edit Page')
+          fill_in('Content', with: 'Updated Wiki Content')
+          click_on('Save changes')
 
-        fill_in('Content', with: 'Updated Wiki Content')
-        click_on('Save changes')
+          expect(page).to have_content('Updated Wiki Content')
+        end
 
-        expect(page).to have_content('Updated Wiki Content')
+        it_behaves_like 'wiki file attachments'
       end
-
-      it_behaves_like 'wiki file attachments'
     end
-  end
 
-  context 'when wiki is not empty' do
-    let(:project_wiki) { create(:project_wiki, project: project, user: project.creator) }
-    let!(:wiki_page) { create(:wiki_page, wiki: project_wiki, attrs: { title: 'home', content: 'Home page' }) }
+    context 'when wiki is not empty' do
+      let(:project_wiki) { create(:project_wiki, project: project, user: project.creator) }
+      let!(:wiki_page) { create(:wiki_page, wiki: project_wiki, attrs: { title: 'home', content: 'Home page' }) }
 
-    before do
-      visit(project_wikis_path(project))
+      before do
+        visit(project_wikis_path(project))
 
-      click_link('Edit')
-    end
+        click_link('Edit')
+      end
 
-    context 'in a user namespace' do
-      let(:project) { create(:project, :wiki_repo) }
+      context 'in a user namespace' do
+        let(:project) { create(:project, :wiki_repo, namespace: user.namespace) }
 
-      it 'updates a page' do
-        # Commit message field should have correct value.
-        expect(page).to have_field('wiki[message]', with: 'Update home')
+        it 'updates a page' do
+          # Commit message field should have correct value.
+          expect(page).to have_field('wiki[message]', with: 'Update home')
 
-        fill_in(:wiki_content, with: 'My awesome wiki!')
-        click_button('Save changes')
+          fill_in(:wiki_content, with: 'My awesome wiki!')
+          click_button('Save changes')
 
-        expect(page).to have_content('Home')
-        expect(page).to have_content("Last edited by #{user.name}")
-        expect(page).to have_content('My awesome wiki!')
-      end
+          expect(page).to have_content('Home')
+          expect(page).to have_content("Last edited by #{user.name}")
+          expect(page).to have_content('My awesome wiki!')
+        end
 
-      it 'shows a validation error message' do
-        fill_in(:wiki_content, with: '')
-        click_button('Save changes')
+        it 'shows a validation error message' do
+          fill_in(:wiki_content, with: '')
+          click_button('Save changes')
 
-        expect(page).to have_selector('.wiki-form')
-        expect(page).to have_content('Edit Page')
-        expect(page).to have_content('The form contains the following error:')
-        expect(page).to have_content("Content can't be blank")
-        expect(find('textarea#wiki_content').value).to eq('')
-      end
+          expect(page).to have_selector('.wiki-form')
+          expect(page).to have_content('Edit Page')
+          expect(page).to have_content('The form contains the following error:')
+          expect(page).to have_content("Content can't be blank")
+          expect(find('textarea#wiki_content').value).to eq('')
+        end
 
-      it 'shows the emoji autocompletion dropdown', :js do
-        find('#wiki_content').native.send_keys('')
-        fill_in(:wiki_content, with: ':')
+        it 'shows the emoji autocompletion dropdown', :js do
+          find('#wiki_content').native.send_keys('')
+          fill_in(:wiki_content, with: ':')
 
-        expect(page).to have_selector('.atwho-view')
-      end
+          expect(page).to have_selector('.atwho-view')
+        end
 
-      it 'shows the error message' do
-        wiki_page.update(content: 'Update')
+        it 'shows the error message' do
+          wiki_page.update(content: 'Update')
 
-        click_button('Save changes')
+          click_button('Save changes')
 
-        expect(page).to have_content('Someone edited the page the same time you did.')
-      end
+          expect(page).to have_content('Someone edited the page the same time you did.')
+        end
 
-      it 'updates a page' do
-        fill_in('Content', with: 'Updated Wiki Content')
-        click_on('Save changes')
+        it 'updates a page' do
+          fill_in('Content', with: 'Updated Wiki Content')
+          click_on('Save changes')
 
-        expect(page).to have_content('Updated Wiki Content')
-      end
+          expect(page).to have_content('Updated Wiki Content')
+        end
 
-      it 'cancels editing of a page' do
-        page.within(:css, '.wiki-form .form-actions') do
-          click_on('Cancel')
+        it 'cancels editing of a page' do
+          page.within(:css, '.wiki-form .form-actions') do
+            click_on('Cancel')
+          end
+
+          expect(current_path).to eq(project_wiki_path(project, wiki_page))
         end
 
-        expect(current_path).to eq(project_wiki_path(project, wiki_page))
+        it_behaves_like 'wiki file attachments'
       end
 
-      it_behaves_like 'wiki file attachments'
-    end
+      context 'in a group namespace' do
+        let(:project) { create(:project, :wiki_repo, namespace: create(:group, :public)) }
 
-    context 'in a group namespace' do
-      let(:project) { create(:project, :wiki_repo, namespace: create(:group, :public)) }
+        it 'updates a page' do
+          # Commit message field should have correct value.
+          expect(page).to have_field('wiki[message]', with: 'Update home')
 
-      it 'updates a page' do
-        # Commit message field should have correct value.
-        expect(page).to have_field('wiki[message]', with: 'Update home')
+          fill_in(:wiki_content, with: 'My awesome wiki!')
 
-        fill_in(:wiki_content, with: 'My awesome wiki!')
+          click_button('Save changes')
 
-        click_button('Save changes')
+          expect(page).to have_content('Home')
+          expect(page).to have_content("Last edited by #{user.name}")
+          expect(page).to have_content('My awesome wiki!')
+        end
 
-        expect(page).to have_content('Home')
-        expect(page).to have_content("Last edited by #{user.name}")
-        expect(page).to have_content('My awesome wiki!')
+        it_behaves_like 'wiki file attachments'
       end
-
-      it_behaves_like 'wiki file attachments'
     end
-  end
 
-  context 'when the page is in a subdir' do
-    let!(:project) { create(:project, :wiki_repo) }
-    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' }) }
+    context 'when the page is in a subdir' do
+      let!(:project) { create(:project, :wiki_repo, 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
+      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}")
+      it 'moves the page to the root folder', :skip_gitaly_mock do
+        fill_in(:wiki_title, with: "/#{page_name}")
 
-      click_button('Save changes')
+        click_button('Save changes')
 
-      expect(current_path).to eq(project_wiki_path(project, page_name))
-    end
+        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}"
+      it 'moves the page to other dir' do
+        new_page_dir = "foo1/bar1/#{page_name}"
 
-      fill_in(:wiki_title, with: new_page_dir)
+        fill_in(:wiki_title, with: new_page_dir)
 
-      click_button('Save changes')
+        click_button('Save changes')
 
-      expect(current_path).to eq(project_wiki_path(project, new_page_dir))
-    end
+        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)
 
-    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)
 
-      fill_in(:wiki_title, with: page_name)
+        click_button('Save changes')
 
-      click_button('Save changes')
+        expect(current_path).to eq(original_path)
+      end
 
-      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"
 
-    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)
 
-      fill_in(:wiki_title, with: new_page_dir)
+        click_button('Save changes')
 
-      click_button('Save changes')
+        expect(current_path).to eq(project_wiki_path(project, new_page_dir))
+      end
 
-      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'
 
-    it 'can be renamed and moved to the root folder' do
-      new_name = 'new_page_name'
+        fill_in(:wiki_title, with: "/#{new_name}")
 
-      fill_in(:wiki_title, with: "/#{new_name}")
+        click_button('Save changes')
 
-      click_button('Save changes')
+        expect(current_path).to eq(project_wiki_path(project, new_name))
+      end
 
-      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}  "
 
-    it 'squishes the title before creating the page' do
-      new_page_dir = "  foo1 /  bar1  /  #{page_name}  "
+        fill_in(:wiki_title, with: new_page_dir)
 
-      fill_in(:wiki_title, with: new_page_dir)
+        click_button('Save changes')
 
-      click_button('Save changes')
+        expect(current_path).to eq(project_wiki_path(project, "foo1/bar1/#{page_name}"))
+      end
 
-      expect(current_path).to eq(project_wiki_path(project, "foo1/bar1/#{page_name}"))
+      it_behaves_like 'wiki file attachments'
     end
+  end
+
+  context 'when Gitaly is enabled' do
+    it_behaves_like 'wiki page user update'
+  end
 
-    it_behaves_like 'wiki file attachments'
+  context 'when Gitaly is disabled', :skip_gitaly_mock do
+    it_behaves_like 'wiki page user update'
   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 3c93d71ab00..4b974a3ca10 100644
--- a/spec/features/projects/wiki/user_views_wiki_page_spec.rb
+++ b/spec/features/projects/wiki/user_views_wiki_page_spec.rb
@@ -1,164 +1,174 @@
 require 'spec_helper'
 
 describe 'User views a wiki page' do
-  include WikiHelpers
-
-  let(:user) { create(:user) }
-  let(:project) { create(:project, :wiki_repo, namespace: user.namespace) }
-  let(:path) { 'image.png' }
-  let(:wiki_page) do
-    create(:wiki_page,
-           wiki: project.wiki,
-           attrs: { title: 'home', content: "Look at this [image](#{path})\n\n ![alt text](#{path})" })
-  end
-
-  before do
-    project.add_maintainer(user)
-    sign_in(user)
-  end
+  shared_examples 'wiki page user view' do
+    include WikiHelpers
+
+    let(:user) { create(:user) }
+    let(:project) { create(:project, :wiki_repo, namespace: user.namespace) }
+    let(:path) { 'image.png' }
+    let(:wiki_page) do
+      create(:wiki_page,
+        wiki: project.wiki,
+        attrs: { title: 'home', content: "Look at this [image](#{path})\n\n ![alt text](#{path})" })
+    end
 
-  context 'when wiki is empty' do
     before do
-      visit(project_wikis_path(project))
-      click_link "Create your first page"
+      project.add_maintainer(user)
+      sign_in(user)
+    end
 
-      click_on('New page')
+    context 'when wiki is empty' do
+      before do
+        visit(project_wikis_path(project))
+        click_link "Create your first page"
 
-      page.within('#modal-new-wiki') do
-        fill_in(:new_wiki_path, with: 'one/two/three-test')
-        click_on('Create page')
-      end
+        click_on('New page')
+
+        page.within('#modal-new-wiki') do
+          fill_in(:new_wiki_path, with: 'one/two/three-test')
+          click_on('Create page')
+        end
 
-      page.within('.wiki-form') do
-        fill_in(:wiki_content, with: 'wiki content')
-        click_on('Create page')
+        page.within('.wiki-form') do
+          fill_in(:wiki_content, with: 'wiki content')
+          click_on('Create page')
+        end
       end
-    end
 
-    it 'shows the history of a page that has a path', :js do
-      expect(current_path).to include('one/two/three-test')
+      it 'shows the history of a page that has a path', :js do
+        expect(current_path).to include('one/two/three-test')
 
-      first(:link, text: 'Three').click
-      click_on('Page history')
+        first(:link, text: 'Three').click
+        click_on('Page history')
 
-      expect(current_path).to include('one/two/three-test')
+        expect(current_path).to include('one/two/three-test')
 
-      page.within(:css, '.nav-text') do
-        expect(page).to have_content('History')
+        page.within(:css, '.nav-text') do
+          expect(page).to have_content('History')
+        end
       end
-    end
 
-    it 'shows an old version of a page', :js do
-      expect(current_path).to include('one/two/three-test')
-      expect(find('.wiki-pages')).to have_content('Three')
+      it 'shows an old version of a page', :js do
+        expect(current_path).to include('one/two/three-test')
+        expect(find('.wiki-pages')).to have_content('Three')
 
-      first(:link, text: 'Three').click
+        first(:link, text: 'Three').click
 
-      expect(find('.nav-text')).to have_content('Three')
+        expect(find('.nav-text')).to have_content('Three')
 
-      click_on('Edit')
+        click_on('Edit')
 
-      expect(current_path).to include('one/two/three-test')
-      expect(page).to have_content('Edit Page')
+        expect(current_path).to include('one/two/three-test')
+        expect(page).to have_content('Edit Page')
 
-      fill_in('Content', with: 'Updated Wiki Content')
+        fill_in('Content', with: 'Updated Wiki Content')
 
-      click_on('Save changes')
-      click_on('Page history')
+        click_on('Save changes')
+        click_on('Page history')
 
-      page.within(:css, '.nav-text') do
-        expect(page).to have_content('History')
-      end
+        page.within(:css, '.nav-text') do
+          expect(page).to have_content('History')
+        end
 
-      find('a[href*="?version_id"]')
+        find('a[href*="?version_id"]')
+      end
     end
-  end
 
-  context 'when a page does not have history' do
-    before do
-      visit(project_wiki_path(project, wiki_page))
-    end
+    context 'when a page does not have history' do
+      before do
+        visit(project_wiki_path(project, wiki_page))
+      end
 
-    it 'shows all the pages' do
-      expect(page).to have_content(user.name)
-      expect(find('.wiki-pages')).to have_content(wiki_page.title.capitalize)
-    end
+      it 'shows all the pages' do
+        expect(page).to have_content(user.name)
+        expect(find('.wiki-pages')).to have_content(wiki_page.title.capitalize)
+      end
+
+      context 'shows a file stored in a page' do
+        let(:path) { upload_file_to_wiki(project, user, 'dk.png') }
+
+        it do
+          expect(page).to have_xpath("//img[@data-src='#{project.wiki.wiki_base_path}/#{path}']")
+          expect(page).to have_link('image', href: "#{project.wiki.wiki_base_path}/#{path}")
+
+          click_on('image')
 
-    context 'shows a file stored in a page' do
-      let(:path) { upload_file_to_wiki(project, user, 'dk.png') }
+          expect(current_path).to match("wikis/#{path}")
+          expect(page).not_to have_xpath('/html') # Page should render the image which means there is no html involved
+        end
+      end
 
-      it do
-        expect(page).to have_xpath("//img[@data-src='#{project.wiki.wiki_base_path}/#{path}']")
+      it 'shows the creation page if file does not exist' do
         expect(page).to have_link('image', href: "#{project.wiki.wiki_base_path}/#{path}")
 
         click_on('image')
 
         expect(current_path).to match("wikis/#{path}")
-        expect(page).not_to have_xpath('/html') # Page should render the image which means there is no html involved
+        expect(page).to have_content('New Wiki Page')
+        expect(page).to have_content('Create page')
       end
     end
 
-    it 'shows the creation page if file does not exist' do
-      expect(page).to have_link('image', href: "#{project.wiki.wiki_base_path}/#{path}")
+    context 'when a page has history' do
+      before do
+        wiki_page.update(message: 'updated home', content: 'updated [some link](other-page)')
+      end
 
-      click_on('image')
+      it 'shows the page history' do
+        visit(project_wiki_path(project, wiki_page))
 
-      expect(current_path).to match("wikis/#{path}")
-      expect(page).to have_content('New Wiki Page')
-      expect(page).to have_content('Create page')
-    end
-  end
+        expect(page).to have_selector('a.btn', text: 'Edit')
 
-  context 'when a page has history' do
-    before do
-      wiki_page.update(message: 'updated home', content: 'updated [some link](other-page)')
-    end
+        click_on('Page history')
 
-    it 'shows the page history' do
-      visit(project_wiki_path(project, wiki_page))
-
-      expect(page).to have_selector('a.btn', text: 'Edit')
+        expect(page).to have_content(user.name)
+        expect(page).to have_content("#{user.username} created page: home")
+        expect(page).to have_content('updated home')
+      end
 
-      click_on('Page history')
+      it 'does not show the "Edit" button' do
+        visit(project_wiki_path(project, wiki_page, version_id: wiki_page.versions.last.id))
 
-      expect(page).to have_content(user.name)
-      expect(page).to have_content("#{user.username} created page: home")
-      expect(page).to have_content('updated home')
+        expect(page).not_to have_selector('a.btn', text: 'Edit')
+      end
     end
 
-    it 'does not show the "Edit" button' do
-      visit(project_wiki_path(project, wiki_page, version_id: wiki_page.versions.last.id))
+    context 'when page has invalid content encoding' do
+      let(:content) { 'whatever'.force_encoding('ISO-8859-1') }
 
-      expect(page).not_to have_selector('a.btn', text: 'Edit')
-    end
-  end
+      before do
+        allow(Gitlab::EncodingHelper).to receive(:encode!).and_return(content)
 
-  context 'when page has invalid content encoding' do
-    let(:content) { 'whatever'.force_encoding('ISO-8859-1') }
+        visit(project_wiki_path(project, wiki_page))
+      end
 
-    before do
-      allow(Gitlab::EncodingHelper).to receive(:encode!).and_return(content)
+      it 'does not show "Edit" button' do
+        expect(page).not_to have_selector('a.btn', text: 'Edit')
+      end
 
-      visit(project_wiki_path(project, wiki_page))
+      it 'shows error' do
+        page.within(:css, '.flash-notice') do
+          expect(page).to have_content('The content of this page is not encoded in UTF-8. Edits can only be made via the Git repository.')
+        end
+      end
     end
 
-    it 'does not show "Edit" button' do
-      expect(page).not_to have_selector('a.btn', text: 'Edit')
-    end
+    it 'opens a default wiki page', :js do
+      visit(project_path(project))
 
-    it 'shows error' do
-      page.within(:css, '.flash-notice') do
-        expect(page).to have_content('The content of this page is not encoded in UTF-8. Edits can only be made via the Git repository.')
-      end
+      find('.shortcuts-wiki').click
+      click_link "Create your first page"
+
+      expect(page).to have_content('Home · Create Page')
     end
   end
 
-  it 'opens a default wiki page', :js do
-    visit(project_path(project))
-
-    find('.shortcuts-wiki').click
-    click_link "Create your first page"
+  context 'when Gitaly is enabled' do
+    it_behaves_like 'wiki page user view'
+  end
 
-    expect(page).to have_content('Home · Create Page')
+  context 'when Gitaly is disabled', :skip_gitaly_mock do
+    it_behaves_like 'wiki page user view'
   end
 end