Add latest changes from gitlab-org/gitlab@master

4 files changed, 1 insertions, 8 deletions

diff --git a/spec/models/personal_snippet_spec.rb b/spec/models/personal_snippet_spec.rb
index 4a949a75cbd..a055f107e33 100644
--- a/spec/models/personal_snippet_spec.rb
+++ b/spec/models/personal_snippet_spec.rb
@@ -21,8 +21,6 @@ describe PersonalSnippet do
     let_it_be(:container) { create(:personal_snippet, :repository) }
     let(:stubbed_container) { build_stubbed(:personal_snippet) }
     let(:expected_full_path) { "@snippets/#{container.id}" }
-    let(:expected_repository_klass) { Repository }
-    let(:expected_storage_klass) { Storage::Hashed }
     let(:expected_web_url_path) { "snippets/#{container.id}" }
   end
 end
diff --git a/spec/models/project_snippet_spec.rb b/spec/models/project_snippet_spec.rb
index 09b4ec3677c..719a74f995d 100644
--- a/spec/models/project_snippet_spec.rb
+++ b/spec/models/project_snippet_spec.rb
@@ -37,8 +37,6 @@ describe ProjectSnippet do
     let_it_be(:container) { create(:project_snippet, :repository) }
     let(:stubbed_container) { build_stubbed(:project_snippet) }
     let(:expected_full_path) { "#{container.project.full_path}/@snippets/#{container.id}" }
-    let(:expected_repository_klass) { Repository }
-    let(:expected_storage_klass) { Storage::Hashed }
     let(:expected_web_url_path) { "#{container.project.full_path}/snippets/#{container.id}" }
   end
 end
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 0904ebca670..21c074cdce2 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -116,9 +116,6 @@ describe Project do
       let_it_be(:container) { create(:project, :repository, path: 'somewhere') }
       let(:stubbed_container) { build_stubbed(:project) }
       let(:expected_full_path) { "#{container.namespace.full_path}/somewhere" }
-      let(:expected_repository_klass) { Repository }
-      let(:expected_storage_klass) { Storage::Hashed }
-      let(:expected_web_url_path) { "#{container.namespace.full_path}/somewhere" }
     end
 
     it 'has an inverse relationship with merge requests' do
diff --git a/spec/models/project_wiki_spec.rb b/spec/models/project_wiki_spec.rb
index 2d660d1deab..9f5fd3a9495 100644
--- a/spec/models/project_wiki_spec.rb
+++ b/spec/models/project_wiki_spec.rb
@@ -28,7 +28,7 @@ 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")
+      expect(subject.web_url).to eq(Gitlab::UrlBuilder.build(subject))
     end
   end