Add latest changes from gitlab-org/gitlab@master

spec/frontend/repository/components/table/parent_row_spec.js

@@ -32,8 +32,8 @@ describe('Repository parent row component', () => {
   it.each`
     path            | to
-    ${'app'}        | ${'/tree/master/'}
-    ${'app/assets'} | ${'/tree/master/app'}
+    ${'app'}        | ${'/-/tree/master/'}
+    ${'app/assets'} | ${'/-/tree/master/app'}
   `('renders link in $path to $to', ({ path, to }) => {
     factory(path);
@@ -48,7 +48,7 @@ describe('Repository parent row component', () => {
     vm.find('td').trigger('click');
     expect($router.push).toHaveBeenCalledWith({
-      path: '/tree/master/app',
+      path: '/-/tree/master/app',
     });
   });
@@ -60,7 +60,7 @@ describe('Repository parent row component', () => {
     vm.find('a').trigger('click');
     expect($router.push).not.toHaveBeenCalledWith({
-      path: '/tree/master/app',
+      path: '/-/tree/master/app',
     });
   });

spec/frontend/repository/components/table/row_spec.js

@@ -88,7 +88,7 @@ describe('Repository table row component', () => {
       vm.trigger('click');
       if (pushes) {
-        expect($router.push).toHaveBeenCalledWith({ path: '/tree/master/test' });
+        expect($router.push).toHaveBeenCalledWith({ path: '/-/tree/master/test' });
       } else {
         expect($router.push).not.toHaveBeenCalled();
       }

spec/frontend/repository/router_spec.js

@@ -4,11 +4,11 @@ import createRouter from '~/repository/router';
 describe('Repository router spec', () => {
   it.each`
-    path                         | component    | componentName
-    ${'/'}                       | ${IndexPage} | ${'IndexPage'}
-    ${'/tree/master'}            | ${TreePage}  | ${'TreePage'}
-    ${'/tree/master/app/assets'} | ${TreePage}  | ${'TreePage'}
-    ${'/tree/123/app/assets'}    | ${null}      | ${'null'}
+    path                           | component    | componentName
+    ${'/'}                         | ${IndexPage} | ${'IndexPage'}
+    ${'/-/tree/master'}            | ${TreePage}  | ${'TreePage'}
+    ${'/-/tree/master/app/assets'} | ${TreePage}  | ${'TreePage'}
+    ${'/-/tree/123/app/assets'}    | ${null}      | ${'null'}
   `('sets component as $componentName for path "$path"', ({ path, component }) => {
     const router = createRouter('', 'master');

spec/helpers/blob_helper_spec.rb

@@ -56,7 +56,7 @@ describe BlobHelper do
       stub_feature_flags(web_ide_default: false)
       link = helper.edit_blob_button(project, 'master', 'README.md')
-      expect(Capybara.string(link).find_link('Edit')[:href]).to eq("/#{project.full_path}/edit/master/README.md")
+      expect(Capybara.string(link).find_link('Edit')[:href]).to eq("/#{project.full_path}/-/edit/master/README.md")
     end
     it 'returns a link with a Web IDE route' do
@@ -69,7 +69,7 @@ describe BlobHelper do
       stub_feature_flags(web_ide_default: false)
       link = helper.edit_blob_button(project, 'master', 'README.md', link_opts: { mr_id: 10 })
-      expect(Capybara.string(link).find_link('Edit')[:href]).to eq("/#{project.full_path}/edit/master/README.md?mr_id=10")
+      expect(Capybara.string(link).find_link('Edit')[:href]).to eq("/#{project.full_path}/-/edit/master/README.md?mr_id=10")
     end
   end

spec/helpers/markup_helper_spec.rb

@@ -103,7 +103,7 @@ describe MarkupHelper do
         let(:requested_path) { 'files/images/README.md' }
         it 'returns the correct HTML for the image' do
-          expanded_path = "/#{project.full_path}/raw/master/files/images/#{image_file}"
+          expanded_path = "/#{project.full_path}/-/raw/master/files/images/#{image_file}"
           expect(subject.css('a')[0].attr('href')).to eq(expanded_path)
           expect(subject.css('img')[0].attr('data-src')).to eq(expanded_path)

spec/helpers/submodule_helper_spec.rb

@@ -100,34 +100,34 @@ describe SubmoduleHelper do
         allow(repo).to receive(:project).and_return(project)
         stub_url('./')
-        expect(subject).to eq(["/master-project/#{project.path}", "/master-project/#{project.path}/tree/hash"])
+        expect(subject).to eq(["/master-project/#{project.path}", "/master-project/#{project.path}/-/tree/hash"])
       end
     end
     context 'submodule on gitlab.com' do
       it 'detects ssh' do
         stub_url('git@gitlab.com:gitlab-org/gitlab-foss.git')
-        expect(subject).to eq(['https://gitlab.com/gitlab-org/gitlab-foss', 'https://gitlab.com/gitlab-org/gitlab-foss/tree/hash'])
+        expect(subject).to eq(['https://gitlab.com/gitlab-org/gitlab-foss', 'https://gitlab.com/gitlab-org/gitlab-foss/-/tree/hash'])
       end
       it 'detects http' do
         stub_url('http://gitlab.com/gitlab-org/gitlab-foss.git')
-        expect(subject).to eq(['https://gitlab.com/gitlab-org/gitlab-foss', 'https://gitlab.com/gitlab-org/gitlab-foss/tree/hash'])
+        expect(subject).to eq(['https://gitlab.com/gitlab-org/gitlab-foss', 'https://gitlab.com/gitlab-org/gitlab-foss/-/tree/hash'])
       end
       it 'detects https' do
         stub_url('https://gitlab.com/gitlab-org/gitlab-foss.git')
-        expect(subject).to eq(['https://gitlab.com/gitlab-org/gitlab-foss', 'https://gitlab.com/gitlab-org/gitlab-foss/tree/hash'])
+        expect(subject).to eq(['https://gitlab.com/gitlab-org/gitlab-foss', 'https://gitlab.com/gitlab-org/gitlab-foss/-/tree/hash'])
       end
       it 'handles urls with no .git on the end' do
         stub_url('http://gitlab.com/gitlab-org/gitlab-foss')
-        expect(subject).to eq(['https://gitlab.com/gitlab-org/gitlab-foss', 'https://gitlab.com/gitlab-org/gitlab-foss/tree/hash'])
+        expect(subject).to eq(['https://gitlab.com/gitlab-org/gitlab-foss', 'https://gitlab.com/gitlab-org/gitlab-foss/-/tree/hash'])
       end
       it 'handles urls with trailing whitespace' do
         stub_url('http://gitlab.com/gitlab-org/gitlab-foss.git  ')
-        expect(subject).to eq(['https://gitlab.com/gitlab-org/gitlab-foss', 'https://gitlab.com/gitlab-org/gitlab-foss/tree/hash'])
+        expect(subject).to eq(['https://gitlab.com/gitlab-org/gitlab-foss', 'https://gitlab.com/gitlab-org/gitlab-foss/-/tree/hash'])
       end
       it 'returns original with non-standard url' do
@@ -171,7 +171,7 @@ describe SubmoduleHelper do
         stub_url(relative_path)
         result = subject
-        expect(result).to eq([expected_path, "#{expected_path}/tree/#{submodule_item.id}"])
+        expect(result).to eq([expected_path, "#{expected_path}/-/tree/#{submodule_item.id}"])
       end
       it 'handles project under same group' do

spec/javascripts/vue_shared/components/diff_viewer/diff_viewer_spec.js

@@ -38,11 +38,11 @@ describe('DiffViewer', () => {
     setTimeout(() => {
       expect(vm.$el.querySelector('.deleted img').getAttribute('src')).toBe(
-        `//raw/DEF/${RED_BOX_IMAGE_URL}`,
+        `//-/raw/DEF/${RED_BOX_IMAGE_URL}`,
       );
       expect(vm.$el.querySelector('.added img').getAttribute('src')).toBe(
-        `//raw/ABC/${GREEN_BOX_IMAGE_URL}`,
+        `//-/raw/ABC/${GREEN_BOX_IMAGE_URL}`,
       );
       done();

spec/javascripts/vue_shared/components/pagination/graphql_pagination_spec.js

-import { shallowMount, createLocalVue } from '@vue/test-utils';
-import GraphqlPagination from '~/vue_shared/components/pagination/graphql_pagination.vue';
-
-const localVue = createLocalVue();
-
-describe('Graphql Pagination component', () => {
-  let wrapper;
-  function factory({ hasNextPage = true, hasPreviousPage = true }) {
-    wrapper = shallowMount(localVue.extend(GraphqlPagination), {
-      propsData: {
-        hasNextPage,
-        hasPreviousPage,
-      },
-      localVue,
-    });
-  }
-
-  afterEach(() => {
-    wrapper.destroy();
-  });
-
-  describe('without previous page', () => {
-    beforeEach(() => {
-      factory({ hasPreviousPage: false });
-    });
-
-    it('renders disabled previous button', () => {
-      expect(wrapper.find('.js-prev-btn').attributes().disabled).toEqual('true');
-    });
-  });
-
-  describe('with previous page', () => {
-    beforeEach(() => {
-      factory({ hasPreviousPage: true });
-    });
-
-    it('renders enabled previous button', () => {
-      expect(wrapper.find('.js-prev-btn').attributes().disabled).toEqual(undefined);
-    });
-
-    it('emits previousClicked on click', () => {
-      wrapper.find('.js-prev-btn').vm.$emit('click');
-
-      expect(wrapper.emitted().previousClicked.length).toBe(1);
-    });
-  });
-
-  describe('without next page', () => {
-    beforeEach(() => {
-      factory({ hasNextPage: false });
-    });
-
-    it('renders disabled next button', () => {
-      expect(wrapper.find('.js-next-btn').attributes().disabled).toEqual('true');
-    });
-  });
-
-  describe('with next page', () => {
-    beforeEach(() => {
-      factory({ hasNextPage: true });
-    });
-
-    it('renders enabled next button', () => {
-      expect(wrapper.find('.js-next-btn').attributes().disabled).toEqual(undefined);
-    });
-
-    it('emits nextClicked on click', () => {
-      wrapper.find('.js-next-btn').vm.$emit('click');
-
-      expect(wrapper.emitted().nextClicked.length).toBe(1);
-    });
-  });
-});

spec/lib/banzai/filter/repository_link_filter_spec.rb

@@ -152,7 +152,7 @@ describe Banzai::Filter::RepositoryLinkFilter do
     it 'rebuilds absolute URL for a file in the repo' do
       doc = filter(link('/doc/api/README.md'))
       expect(doc.at_css('a')['href'])
-        .to eq "/#{project_path}/blob/#{ref}/doc/api/README.md"
+        .to eq "/#{project_path}/-/blob/#{ref}/doc/api/README.md"
     end
     it 'does not modify relative URLs in system notes' do
@@ -170,13 +170,13 @@ describe Banzai::Filter::RepositoryLinkFilter do
     it 'rebuilds relative URL for a file in the repo' do
       doc = filter(link('doc/api/README.md'))
       expect(doc.at_css('a')['href'])
-        .to eq "/#{project_path}/blob/#{ref}/doc/api/README.md"
+        .to eq "/#{project_path}/-/blob/#{ref}/doc/api/README.md"
     end
     it 'rebuilds relative URL for a file in the repo with leading ./' do
       doc = filter(link('./doc/api/README.md'))
       expect(doc.at_css('a')['href'])
-        .to eq "/#{project_path}/blob/#{ref}/doc/api/README.md"
+        .to eq "/#{project_path}/-/blob/#{ref}/doc/api/README.md"
     end
     it 'rebuilds relative URL for a file in the repo up one directory' do
@@ -184,7 +184,7 @@ describe Banzai::Filter::RepositoryLinkFilter do
       doc = filter(relative_link, requested_path: 'doc/update/7.14-to-8.0.md')
       expect(doc.at_css('a')['href'])
-        .to eq "/#{project_path}/blob/#{ref}/doc/api/README.md"
+        .to eq "/#{project_path}/-/blob/#{ref}/doc/api/README.md"
     end
     it 'rebuilds relative URL for a file in the repo up multiple directories' do
@@ -192,7 +192,7 @@ describe Banzai::Filter::RepositoryLinkFilter do
       doc = filter(relative_link, requested_path: 'doc/foo/bar/baz/README.md')
       expect(doc.at_css('a')['href'])
-        .to eq "/#{project_path}/blob/#{ref}/doc/api/README.md"
+        .to eq "/#{project_path}/-/blob/#{ref}/doc/api/README.md"
     end
     it 'rebuilds relative URL for a file in the repository root' do
@@ -200,47 +200,47 @@ describe Banzai::Filter::RepositoryLinkFilter do
       doc = filter(relative_link, requested_path: 'doc/some-file.md')
       expect(doc.at_css('a')['href'])
-        .to eq "/#{project_path}/blob/#{ref}/README.md"
+        .to eq "/#{project_path}/-/blob/#{ref}/README.md"
     end
     it 'rebuilds relative URL for a file in the repo with an anchor' do
       doc = filter(link('README.md#section'))
       expect(doc.at_css('a')['href'])
-        .to eq "/#{project_path}/blob/#{ref}/README.md#section"
+        .to eq "/#{project_path}/-/blob/#{ref}/README.md#section"
     end
     it 'rebuilds relative URL for a directory in the repo' do
       doc = filter(link('doc/api/'))
       expect(doc.at_css('a')['href'])
-        .to eq "/#{project_path}/tree/#{ref}/doc/api"
+        .to eq "/#{project_path}/-/tree/#{ref}/doc/api"
     end
     it 'rebuilds relative URL for an image in the repo' do
       doc = filter(image('files/images/logo-black.png'))
       expect(doc.at_css('img')['src'])
-        .to eq "/#{project_path}/raw/#{ref}/files/images/logo-black.png"
+        .to eq "/#{project_path}/-/raw/#{ref}/files/images/logo-black.png"
     end
     it 'rebuilds relative URL for link to an image in the repo' do
       doc = filter(link('files/images/logo-black.png'))
       expect(doc.at_css('a')['href'])
-        .to eq "/#{project_path}/raw/#{ref}/files/images/logo-black.png"
+        .to eq "/#{project_path}/-/raw/#{ref}/files/images/logo-black.png"
     end
     it 'rebuilds relative URL for a video in the repo' do
       doc = filter(video('files/videos/intro.mp4'), commit: project.commit('video'), ref: 'video')
       expect(doc.at_css('video')['src'])
-        .to eq "/#{project_path}/raw/video/files/videos/intro.mp4"
+        .to eq "/#{project_path}/-/raw/video/files/videos/intro.mp4"
     end
     it 'rebuilds relative URL for audio in the repo' do
       doc = filter(audio('files/audio/sample.wav'), commit: project.commit('audio'), ref: 'audio')
       expect(doc.at_css('audio')['src'])
-        .to eq "/#{project_path}/raw/audio/files/audio/sample.wav"
+        .to eq "/#{project_path}/-/raw/audio/files/audio/sample.wav"
     end
     it 'does not modify relative URL with an anchor only' do
@@ -267,7 +267,7 @@ describe Banzai::Filter::RepositoryLinkFilter do
       allow_any_instance_of(described_class).to receive(:uri_type).and_return(:raw)
       doc = filter(image(escaped))
-      expect(doc.at_css('img')['src']).to eq "/#{project_path}/raw/#{Addressable::URI.escape(ref)}/#{escaped}"
+      expect(doc.at_css('img')['src']).to eq "/#{project_path}/-/raw/#{Addressable::URI.escape(ref)}/#{escaped}"
     end
     context 'when requested path is a file in the repo' do
@@ -275,7 +275,7 @@ describe Banzai::Filter::RepositoryLinkFilter do
       it 'rebuilds URL relative to the containing directory' do
         doc = filter(link('users.md'))
-        expect(doc.at_css('a')['href']).to eq "/#{project_path}/blob/#{Addressable::URI.escape(ref)}/doc/api/users.md"
+        expect(doc.at_css('a')['href']).to eq "/#{project_path}/-/blob/#{Addressable::URI.escape(ref)}/doc/api/users.md"
       end
     end
@@ -284,7 +284,7 @@ describe Banzai::Filter::RepositoryLinkFilter do
       it 'rebuilds URL relative to the directory' do
         doc = filter(link('users.md'))
-        expect(doc.at_css('a')['href']).to eq "/#{project_path}/blob/#{Addressable::URI.escape(ref)}/doc/api/users.md"
+        expect(doc.at_css('a')['href']).to eq "/#{project_path}/-/blob/#{Addressable::URI.escape(ref)}/doc/api/users.md"
       end
     end
@@ -295,7 +295,7 @@ describe Banzai::Filter::RepositoryLinkFilter do
       it 'correctly escapes the ref' do
         doc = filter(link('.gitkeep'))
-        expect(doc.at_css('a')['href']).to eq "/#{project_path}/blob/#{Addressable::URI.escape(ref)}/foo/bar/.gitkeep"
+        expect(doc.at_css('a')['href']).to eq "/#{project_path}/-/blob/#{Addressable::URI.escape(ref)}/foo/bar/.gitkeep"
       end
     end
@@ -314,7 +314,7 @@ describe Banzai::Filter::RepositoryLinkFilter do
         doc = filter(link(path))
         expect(doc.at_css('a')['href'])
-          .to eq "/#{project_path}/raw/#{ref_escaped}/files/images/logo-black.png"
+          .to eq "/#{project_path}/-/raw/#{ref_escaped}/files/images/logo-black.png"
       end
     end
@@ -325,7 +325,7 @@ describe Banzai::Filter::RepositoryLinkFilter do
       it 'does not escape the space twice' do
         doc = filter(link('README.md'))
-        expect(doc.at_css('a')['href']).to eq "/#{project_path}/blob/#{Addressable::URI.escape(ref)}/with%20space/README.md"
+        expect(doc.at_css('a')['href']).to eq "/#{project_path}/-/blob/#{Addressable::URI.escape(ref)}/with%20space/README.md"
       end
     end
   end

spec/lib/extracts_path_spec.rb

@@ -31,7 +31,7 @@ describe ExtractsPath do
     it "log tree path has no escape sequences" do
       assign_ref_vars
-      expect(@logs_path).to eq("/#{@project.full_path}/refs/#{ref}/logs_tree/files/ruby/popen.rb")
+      expect(@logs_path).to eq("/#{@project.full_path}/-/refs/#{ref}/logs_tree/files/ruby/popen.rb")
     end
     context 'ref contains %20' do

spec/lib/gitlab/auth/saml/auth_hash_spec.rb

@@ -95,6 +95,17 @@ describe Gitlab::Auth::Saml::AuthHash do
       end
     end
+    context 'with ADFS SAML response_object' do
+      before do
+        auth_hash_data[:extra][:response_object] = { document:
+                                                         saml_xml(File.read('spec/fixtures/authentication/adfs_saml_response.xml')) }
+      end
+
+      it 'can extract authn_context' do
+        expect(saml_auth_hash.authn_context).to eq 'urn:federation:authentication:windows'
+      end
+    end
+
     context 'without response_object' do
       it 'returns an empty string' do
         expect(saml_auth_hash.authn_context).to be_nil

spec/lib/gitlab/conflict/file_spec.rb

@@ -258,7 +258,7 @@ FILE
   describe '#as_json' do
     it 'includes the blob path for the file' do
       expect(conflict_file.as_json[:blob_path])
-        .to eq("/#{project.full_path}/blob/#{our_commit.oid}/files/ruby/regex.rb")
+        .to eq("/#{project.full_path}/-/blob/#{our_commit.oid}/files/ruby/regex.rb")
     end
     it 'includes the blob icon for the file' do

spec/lib/gitlab/dependency_linker/godeps_json_linker_spec.rb

@@ -75,8 +75,8 @@ describe Gitlab::DependencyLinker::GodepsJsonLinker do
     end
     it 'links GitLab projects' do
-      expect(subject).to include(link('gitlab.com/group/project/path', 'https://gitlab.com/group/project/tree/master/path'))
-      expect(subject).to include(link('gitlab.com/group/subgroup/project.git/path', 'https://gitlab.com/group/subgroup/project/tree/master/path'))
+      expect(subject).to include(link('gitlab.com/group/project/path', 'https://gitlab.com/group/project/-/tree/master/path'))
+      expect(subject).to include(link('gitlab.com/group/subgroup/project.git/path', 'https://gitlab.com/group/subgroup/project/-/tree/master/path'))
     end
     it 'links Golang packages' do

spec/lib/gitlab/graphql/representation/submodule_tree_entry_spec.rb

@@ -21,7 +21,7 @@ describe Gitlab::Graphql::Representation::SubmoduleTreeEntry do
       )
       expect(entries.map(&:tree_url)).to contain_exactly(
-        "https://gitlab.com/gitlab-org/gitlab-grack/tree/645f6c4c82fd3f5e06f67134450a570b795e55a6",
+        "https://gitlab.com/gitlab-org/gitlab-grack/-/tree/645f6c4c82fd3f5e06f67134450a570b795e55a6",
         "https://github.com/gitlabhq/gitlab-shell/tree/79bceae69cb5750d6567b223597999bfa91cb3b9",
         "https://github.com/randx/six/tree/409f37c4f05865e4fb208c771485f211a22c4c2d"
       )

spec/lib/gitlab/middleware/go_spec.rb

@@ -241,7 +241,7 @@ describe Gitlab::Middleware::Go do
       project_url = "http://#{Gitlab.config.gitlab.host}/#{path}"
       expect(response[0]).to eq(200)
       expect(response[1]['Content-Type']).to eq('text/html')
-      expected_body = %{<html><head><meta name="go-import" content="#{Gitlab.config.gitlab.host}/#{path} git #{repository_url}" /><meta name="go-source" content="#{Gitlab.config.gitlab.host}/#{path} #{project_url} #{project_url}/tree/#{branch}{/dir} #{project_url}/blob/#{branch}{/dir}/{file}#L{line}" /></head><body>go get #{Gitlab.config.gitlab.url}/#{path}</body></html>}
+      expected_body = %{<html><head><meta name="go-import" content="#{Gitlab.config.gitlab.host}/#{path} git #{repository_url}" /><meta name="go-source" content="#{Gitlab.config.gitlab.host}/#{path} #{project_url} #{project_url}/-/tree/#{branch}{/dir} #{project_url}/-/blob/#{branch}{/dir}/{file}#L{line}" /></head><body>go get #{Gitlab.config.gitlab.url}/#{path}</body></html>}
       expect(response[2].body).to eq([expected_body])
     end
   end

spec/lib/gitlab/submodule_links_spec.rb

@@ -38,7 +38,7 @@ describe Gitlab::SubmoduleLinks do
       end
       it 'returns links and caches the by ref' do
-        expect(subject).to eq(['https://gitlab.com/gitlab-org/gitlab-foss', 'https://gitlab.com/gitlab-org/gitlab-foss/tree/hash'])
+        expect(subject).to eq(['https://gitlab.com/gitlab-org/gitlab-foss', 'https://gitlab.com/gitlab-org/gitlab-foss/-/tree/hash'])
         cache_store = links.instance_variable_get("@cache_store")
@@ -49,7 +49,7 @@ describe Gitlab::SubmoduleLinks do
         let(:ref) { 'signed-commits' }
         it 'returns links' do
-          expect(subject).to eq(['https://gitlab.com/gitlab-org/gitlab-foss', 'https://gitlab.com/gitlab-org/gitlab-foss/tree/hash'])
+          expect(subject).to eq(['https://gitlab.com/gitlab-org/gitlab-foss', 'https://gitlab.com/gitlab-org/gitlab-foss/-/tree/hash'])
         end
       end
     end

spec/models/key_spec.rb

@@ -189,7 +189,7 @@ describe Key, :mailer do
     it 'removes key from authorized_file' do
       key = create(:personal_key)
-      expect(GitlabShellWorker).to receive(:perform_async).with(:remove_key, key.shell_id, key.key)
+      expect(GitlabShellWorker).to receive(:perform_async).with(:remove_key, key.shell_id)
       key.destroy
     end
   end

spec/models/project_spec.rb

@@ -725,7 +725,7 @@ describe Project do
         let(:project) { create(:project, :repository) }
         it 'returns the README' do
-          expect(project.readme_url).to eq("#{project.web_url}/blob/master/README.md")
+          expect(project.readme_url).to eq("#{project.web_url}/-/blob/master/README.md")
         end
       end
     end

spec/models/repository_spec.rb

@@ -1817,10 +1817,28 @@ describe Repository do
   end
   describe '#after_import' do
+    subject { repository.after_import }
+
     it 'flushes and builds the cache' do
       expect(repository).to receive(:expire_content_cache)
-      repository.after_import
+      subject
+    end
+
+    it 'calls DetectRepositoryLanguagesWorker' do
+      expect(DetectRepositoryLanguagesWorker).to receive(:perform_async)
+
+      subject
+    end
+
+    context 'with a wiki repository' do
+      let(:repository) { project.wiki.repository }
+
+      it 'does not call DetectRepositoryLanguagesWorker' do
+        expect(DetectRepositoryLanguagesWorker).not_to receive(:perform_async)
+
+        subject
+      end
     end
   end

spec/presenters/blob_presenter_spec.rb

@@ -21,7 +21,7 @@ describe BlobPresenter, :seed_helper do
     subject { described_class.new(blob) }
-    it { expect(subject.web_url).to eq("http://localhost/#{project.full_path}/blob/#{blob.commit_id}/#{blob.path}") }
+    it { expect(subject.web_url).to eq("http://localhost/#{project.full_path}/-/blob/#{blob.commit_id}/#{blob.path}") }
   end
   describe '#highlight' do