Add latest changes from gitlab-org/gitlab@master

1 files changed, 19 insertions, 3 deletions

diff --git a/spec/models/project_wiki_spec.rb b/spec/models/project_wiki_spec.rb
index 31d1d1fd7d1..f5c827e5a29 100644
--- a/spec/models/project_wiki_spec.rb
+++ b/spec/models/project_wiki_spec.rb
@@ -28,7 +28,9 @@ describe ProjectWiki do
 
   describe '#web_url' do
     it 'returns the full web URL to the wiki' do
-      expect(subject.web_url).to eq("#{Gitlab.config.gitlab.url}/#{project.full_path}/wikis/home")
+      home_url = Gitlab::Routing.url_helpers.project_wiki_url(project, :home)
+
+      expect(subject.web_url).to eq(home_url)
     end
   end
 
@@ -71,9 +73,23 @@ describe ProjectWiki do
 
   describe "#wiki_base_path" do
     it "returns the wiki base path" do
-      wiki_base_path = "#{Gitlab.config.gitlab.relative_url_root}/#{project.full_path}/wikis"
+      wiki_path = Gitlab::Routing.url_helpers.project_wikis_path(project)
+
+      expect(subject.wiki_base_path).to eq(wiki_path)
+    end
+  end
 
-      expect(subject.wiki_base_path).to eq(wiki_base_path)
+  describe "#wiki_page_path" do
+    let(:page) { create(:wiki_page, wiki: project_wiki) }
+
+    describe 'suffixed with /:page_slug' do
+      subject { "#{project_wiki.wiki_page_path}/#{page.slug}" }
+
+      it "equals the project_wiki_path" do
+        path = Gitlab::Routing.url_helpers.project_wiki_path(project, page)
+
+        expect(subject).to eq(path)
+      end
     end
   end