1 files changed, 180 insertions, 118 deletions

diff --git a/spec/support/shared_examples/models/wiki_shared_examples.rb b/spec/support/shared_examples/models/wiki_shared_examples.rb
index 5f6a10bd754..b1aa90449e1 100644
--- a/spec/support/shared_examples/models/wiki_shared_examples.rb
+++ b/spec/support/shared_examples/models/wiki_shared_examples.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 RSpec.shared_examples 'wiki model' do
+  using RSpec::Parameterized::TableSyntax
+
   let_it_be(:user) { create(:user, :commit_email) }
 
   let(:wiki_container) { raise NotImplementedError }
@@ -124,36 +126,6 @@ RSpec.shared_examples 'wiki model' do
     end
   end
 
-  describe '#wiki' do
-    it 'contains a Gitlab::Git::Wiki instance' do
-      expect(subject.wiki).to be_a Gitlab::Git::Wiki
-    end
-
-    it 'creates a new wiki repo if one does not yet exist' do
-      expect(subject.create_page('index', 'test content')).to be_truthy
-    end
-
-    it 'creates a new wiki repo with a default commit message' do
-      expect(subject.create_page('index', 'test content', :markdown, '')).to be_truthy
-
-      page = subject.find_page('index')
-
-      expect(page.last_version.message).to eq("#{user.username} created page: index")
-    end
-
-    context 'when the repository cannot be created' do
-      let(:wiki_container) { wiki_container_without_repo }
-
-      before do
-        expect(subject.repository).to receive(:create_if_not_exists) { false }
-      end
-
-      it 'raises CouldNotCreateWikiError' do
-        expect { subject.wiki }.to raise_exception(Wiki::CouldNotCreateWikiError)
-      end
-    end
-  end
-
   describe '#empty?' do
     context 'when the wiki repository is empty' do
       it 'returns true' do
@@ -180,70 +152,71 @@ RSpec.shared_examples 'wiki model' do
         it 'returns false' do
           expect(subject.empty?).to be(false)
         end
-
-        it 'only instantiates a Wiki page once' do
-          expect(WikiPage).to receive(:new).once.and_call_original
-
-          subject.empty?
-        end
       end
     end
   end
 
   describe '#list_pages' do
-    let(:wiki_pages) { subject.list_pages }
+    shared_examples 'wiki model #list_pages' do
+      let(:wiki_pages) { subject.list_pages }
 
-    before do
-      subject.create_page('index', 'This is an index')
-      subject.create_page('index2', 'This is an index2')
-      subject.create_page('an index3', 'This is an index3')
-    end
+      before do
+        subject.create_page('index', 'This is an index')
+        subject.create_page('index2', 'This is an index2')
+        subject.create_page('an index3', 'This is an index3')
+      end
 
-    it 'returns an array of WikiPage instances' do
-      expect(wiki_pages).to be_present
-      expect(wiki_pages).to all(be_a(WikiPage))
-    end
+      it 'returns an array of WikiPage instances' do
+        expect(wiki_pages).to be_present
+        expect(wiki_pages).to all(be_a(WikiPage))
+      end
 
-    it 'does not load WikiPage content by default' do
-      wiki_pages.each do |page|
-        expect(page.content).to be_empty
+      it 'does not load WikiPage content by default' do
+        wiki_pages.each do |page|
+          expect(page.content).to be_empty
+        end
       end
-    end
 
-    it 'returns all pages by default' do
-      expect(wiki_pages.count).to eq(3)
-    end
+      it 'returns all pages by default' do
+        expect(wiki_pages.count).to eq(3)
+      end
 
-    context 'with limit option' do
-      it 'returns limited set of pages' do
-        expect(subject.list_pages(limit: 1).count).to eq(1)
+      context 'with limit option' do
+        it 'returns limited set of pages' do
+          expect(subject.list_pages(limit: 1).count).to eq(1)
+        end
       end
-    end
 
-    context 'with sorting options' do
-      it 'returns pages sorted by title by default' do
-        pages = ['an index3', 'index', 'index2']
+      context 'with sorting options' do
+        it 'returns pages sorted by title by default' do
+          pages = ['an index3', 'index', 'index2']
 
-        expect(subject.list_pages.map(&:title)).to eq(pages)
-        expect(subject.list_pages(direction: 'desc').map(&:title)).to eq(pages.reverse)
+          expect(subject.list_pages.map(&:title)).to eq(pages)
+          expect(subject.list_pages(direction: 'desc').map(&:title)).to eq(pages.reverse)
+        end
       end
 
-      it 'returns pages sorted by created_at' do
-        pages = ['index', 'index2', 'an index3']
+      context 'with load_content option' do
+        let(:pages) { subject.list_pages(load_content: true) }
 
-        expect(subject.list_pages(sort: 'created_at').map(&:title)).to eq(pages)
-        expect(subject.list_pages(sort: 'created_at', direction: 'desc').map(&:title)).to eq(pages.reverse)
+        it 'loads WikiPage content' do
+          expect(pages.first.content).to eq('This is an index3')
+          expect(pages.second.content).to eq('This is an index')
+          expect(pages.third.content).to eq('This is an index2')
+        end
       end
     end
 
-    context 'with load_content option' do
-      let(:pages) { subject.list_pages(load_content: true) }
-
-      it 'loads WikiPage content' do
-        expect(pages.first.content).to eq('This is an index3')
-        expect(pages.second.content).to eq('This is an index')
-        expect(pages.third.content).to eq('This is an index2')
+    context 'list pages with legacy wiki rpcs' do
+      before do
+        stub_feature_flags(wiki_list_page_with_normal_repository_rpcs: false)
       end
+
+      it_behaves_like 'wiki model #list_pages'
+    end
+
+    context 'list pages with normal repository rpcs' do
+      it_behaves_like 'wiki model #list_pages'
     end
   end
 
@@ -338,6 +311,74 @@ RSpec.shared_examples 'wiki model' do
         end
       end
 
+      context "wiki repository's default branch is updated" do
+        before do
+          old_default_branch = wiki.default_branch
+          subject.create_page('page in updated default branch', 'content')
+          subject.repository.add_branch(user, 'another_branch', old_default_branch)
+          subject.repository.rm_branch(user, old_default_branch)
+          subject.repository.expire_status_cache
+        end
+
+        it 'returns the page in the updated default branch' do
+          wiki = described_class.new(wiki_container, user)
+          page = wiki.find_page('page in updated default branch')
+
+          expect(wiki.default_branch).to eql('another_branch')
+          expect(page.title).to eq('page in updated default branch')
+        end
+      end
+
+      context "wiki repository's HEAD is updated" do
+        before do
+          subject.create_page('page in updated HEAD', 'content')
+          subject.repository.add_branch(user, 'another_branch', subject.default_branch)
+          subject.repository.change_head('another_branch')
+          subject.repository.expire_status_cache
+        end
+
+        it 'returns the page in the new HEAD' do
+          wiki = described_class.new(wiki_container, user)
+          page = subject.find_page('page in updated HEAD')
+
+          expect(wiki.default_branch).to eql('another_branch')
+          expect(page.title).to eq('page in updated HEAD')
+        end
+      end
+
+      context 'pages with relative paths' do
+        where(:path, :title) do
+          [
+            ['~hello.md', '~Hello'],
+            ['hello~world.md', 'Hello~World'],
+            ['~~~hello.md', '~~~Hello'],
+            ['~/hello.md', '~/Hello'],
+            ['hello.md', '/Hello'],
+            ['hello.md', '../Hello'],
+            ['hello.md', './Hello'],
+            ['dir/hello.md', '/dir/Hello']
+          ]
+        end
+
+        with_them do
+          before do
+            wiki.repository.create_file(
+              user, path, "content of wiki file",
+              branch_name: wiki.default_branch,
+              message: "created page #{path}",
+              author_email: user.email,
+              author_name: user.name
+            )
+          end
+
+          it "can find page with `#{params[:title]}` title" do
+            page = subject.find_page(title)
+
+            expect(page.content).to eq("content of wiki file")
+          end
+        end
+      end
+
       context 'pages with different file extensions' do
         where(:extension, :path, :title) do
           [
@@ -378,14 +419,6 @@ RSpec.shared_examples 'wiki model' do
       end
     end
 
-    context 'find page with legacy wiki service' do
-      before do
-        stub_feature_flags(wiki_find_page_with_normal_repository_rpcs: false)
-      end
-
-      it_behaves_like 'wiki model #find_page'
-    end
-
     context 'find page with normal repository RPCs' do
       it_behaves_like 'wiki model #find_page'
     end
@@ -404,14 +437,6 @@ RSpec.shared_examples 'wiki model' do
       end
     end
 
-    context 'find sidebar with legacy wiki service' do
-      before do
-        stub_feature_flags(wiki_find_page_with_normal_repository_rpcs: false)
-      end
-
-      it_behaves_like 'wiki model #find_sidebar'
-    end
-
     context 'find sidebar with normal repository RPCs' do
       it_behaves_like 'wiki model #find_sidebar'
     end
@@ -421,7 +446,7 @@ RSpec.shared_examples 'wiki model' do
     let(:image) { File.open(Rails.root.join('spec', 'fixtures', 'big-image.png')) }
 
     before do
-      subject.wiki # Make sure the wiki repo exists
+      subject.create_wiki_repository # Make sure the wiki repo exists
 
       subject.repository.create_file(user, 'image.png', image, branch_name: subject.default_branch, message: 'add image')
     end
@@ -456,6 +481,22 @@ RSpec.shared_examples 'wiki model' do
         expect(file.raw_data).to be_empty
       end
     end
+
+    context "wiki repository's default branch is updated" do
+      before do
+        old_default_branch = wiki.default_branch
+        subject.repository.add_branch(user, 'another_branch', old_default_branch)
+        subject.repository.rm_branch(user, old_default_branch)
+        subject.repository.expire_status_cache
+      end
+
+      it 'returns the page in the updated default branch' do
+        wiki = described_class.new(wiki_container, user)
+        file = wiki.find_file('image.png')
+
+        expect(file.mime_type).to eq('image/png')
+      end
+    end
   end
 
   describe '#create_page' do
@@ -480,7 +521,7 @@ RSpec.shared_examples 'wiki model' do
       it 'sets the correct commit message' do
         subject.create_page('test page', 'some content', :markdown, 'commit message')
 
-        expect(subject.list_pages.first.page.version.message).to eq('commit message')
+        expect(subject.list_pages.first.version.message).to eq('commit message')
       end
 
       it 'sets the correct commit email' do
@@ -577,6 +618,8 @@ RSpec.shared_examples 'wiki model' do
         'foo'                       | :org        | ['foo.md']          | false
         'foo'                       | :markdown   | ['dir/foo.md']      | true
         '/foo'                      | :markdown   | ['foo.md']          | false
+        '~foo'                      | :markdown   | []                  | true
+        '~~~foo'                    | :markdown   | []                  | true
         './foo'                     | :markdown   | ['foo.md']          | false
         '../foo'                    | :markdown   | ['foo.md']          | false
         '../../foo'                 | :markdown   | ['foo.md']          | false
@@ -607,14 +650,6 @@ RSpec.shared_examples 'wiki model' do
     end
 
     it_behaves_like 'create_page tests'
-
-    context 'create page with legacy find_page wiki service' do
-      it_behaves_like 'create_page tests' do
-        before do
-          stub_feature_flags(wiki_find_page_with_normal_repository_rpcs: false)
-        end
-      end
-    end
   end
 
   describe '#update_page' do
@@ -687,6 +722,8 @@ RSpec.shared_examples 'wiki model' do
       using RSpec::Parameterized::TableSyntax
 
       where(:original_title, :original_format, :updated_title, :updated_format, :expected_title, :expected_path) do
+        'test page'          | :markdown | '~new test page'             | :asciidoc | '~new test page'        | '~new-test-page.asciidoc'
+        'test page'          | :markdown | '~~~new test page'           | :asciidoc | '~~~new test page'      | '~~~new-test-page.asciidoc'
         'test page'          | :markdown | 'new test page'              | :asciidoc | 'new test page'         | 'new-test-page.asciidoc'
         'test page'          | :markdown | 'new dir/new test page'      | :asciidoc | 'new dir/new test page' | 'new-dir/new-test-page.asciidoc'
         'test dir/test page' | :markdown | 'new dir/new test page'      | :asciidoc | 'new dir/new test page' | 'new-dir/new-test-page.asciidoc'
@@ -696,13 +733,13 @@ RSpec.shared_examples 'wiki model' do
         'test dir/test page' | :markdown | nil                          | :markdown | 'test dir/test page'    | 'test-dir/test-page.md'
         'test page'          | :markdown | ''                           | :markdown | 'test page'             | 'test-page.md'
         'test.page'          | :markdown | ''                           | :markdown | 'test.page'             | 'test.page.md'
-        'testpage'           | :markdown | '../testpage'                 | :markdown | 'testpage'              | 'testpage.md'
-        'dir/testpage'       | :markdown | 'dir/../testpage'             | :markdown | 'testpage'              | 'testpage.md'
-        'dir/testpage'       | :markdown | './dir/testpage'              | :markdown | 'dir/testpage'          | 'dir/testpage.md'
-        'dir/testpage'       | :markdown | '../dir/testpage'             | :markdown | 'dir/testpage'          | 'dir/testpage.md'
-        'dir/testpage'       | :markdown | '../dir/../testpage'          | :markdown | 'testpage'              | 'testpage.md'
-        'dir/testpage'       | :markdown | '../dir/../dir/testpage'      | :markdown | 'dir/testpage'          | 'dir/testpage.md'
-        'dir/testpage'       | :markdown | '../dir/../another/testpage'  | :markdown | 'another/testpage'      | 'another/testpage.md'
+        'testpage'           | :markdown | '../testpage'                | :markdown | 'testpage'              | 'testpage.md'
+        'dir/testpage'       | :markdown | 'dir/../testpage'            | :markdown | 'testpage'              | 'testpage.md'
+        'dir/testpage'       | :markdown | './dir/testpage'             | :markdown | 'dir/testpage'          | 'dir/testpage.md'
+        'dir/testpage'       | :markdown | '../dir/testpage'            | :markdown | 'dir/testpage'          | 'dir/testpage.md'
+        'dir/testpage'       | :markdown | '../dir/../testpage'         | :markdown | 'testpage'              | 'testpage.md'
+        'dir/testpage'       | :markdown | '../dir/../dir/testpage'     | :markdown | 'dir/testpage'          | 'dir/testpage.md'
+        'dir/testpage'       | :markdown | '../dir/../another/testpage' | :markdown | 'another/testpage'      | 'another/testpage.md'
       end
     end
 
@@ -711,17 +748,6 @@ RSpec.shared_examples 'wiki model' do
       include_context 'extended examples'
     end
 
-    context 'update page with legacy find_page wiki service' do
-      it_behaves_like 'update_page tests' do
-        before do
-          stub_feature_flags(wiki_find_page_with_normal_repository_rpcs: false)
-        end
-
-        include_context 'common examples'
-        include_context 'extended examples'
-      end
-    end
-
     context 'when format is invalid' do
       let!(:page) { create(:wiki_page, wiki: subject, title: 'test page') }
 
@@ -862,7 +888,7 @@ RSpec.shared_examples 'wiki model' do
   end
 
   describe '#create_wiki_repository' do
-    let(:head_path) { Rails.root.join(TestEnv.repos_path, "#{wiki.disk_path}.git", 'HEAD') }
+    let(:head_path) { Gitlab::GitalyClient::StorageSettings.allow_disk_access { Rails.root.join(TestEnv.repos_path, "#{wiki.disk_path}.git", 'HEAD') } }
     let(:default_branch) { 'foo' }
 
     before do
@@ -895,4 +921,40 @@ RSpec.shared_examples 'wiki model' do
       end
     end
   end
+
+  describe '#preview_slug' do
+    where(:title, :file_extension, :format, :expected_slug) do
+      'The Best Thing'       | :md  | :markdown  | 'The-Best-Thing'
+      'The Best Thing'       | :txt | :plaintext | 'The-Best-Thing'
+      'A Subject/Title Here' | :txt | :plaintext | 'A-Subject/Title-Here'
+      'A subject'            | :txt | :plaintext | 'A-subject'
+      'A 1/B 2/C 3'          | :txt | :plaintext | 'A-1/B-2/C-3'
+      'subject/title'        | :txt | :plaintext | 'subject/title'
+      'subject/title.md'     | :txt | :plaintext | 'subject/title.md'
+      'foo%2Fbar'            | :txt | :plaintext | 'foo%2Fbar'
+      ''                     | :md  | :markdown  | '.md'
+      ''                     | :txt | :plaintext | '.txt'
+    end
+
+    with_them do
+      before do
+        subject.repository.create_file(
+          user, "#{title}.#{file_extension}", 'content',
+          branch_name: subject.default_branch,
+          message: "Add #{title}"
+        )
+      end
+
+      it do
+        expect(described_class.preview_slug(title, file_extension)).to eq(expected_slug)
+      end
+
+      it 'matches the slug generated by gitaly' do
+        skip('Gitaly cannot generate a slug for an empty title') unless title.present?
+
+        gitaly_slug = subject.list_pages.first.slug
+        expect(described_class.preview_slug(title, file_extension)).to eq(gitaly_slug)
+      end
+    end
+  end
 end