Remove duplicate tests for Gitaly

The disabling of Gitaly was basically stubbing `Feature.enabled?` call,
which was never triggered.

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