Add latest changes from gitlab-org/gitlab@12-8-stable-ee

spec/fixtures/sentry/error_list_search_response.json

+[{
+  "lastSeen": "2018-12-31T12:00:11Z",
+  "numComments": 0,
+  "userCount": 0,
+  "stats": {
+    "24h": [
+      [
+        1546437600,
+        0
+      ]
+    ]
+  },
+  "culprit": "sentry.tasks.reports.deliver_organization_user_report",
+  "title": "NotFound desc = GetRepoPath: not a git repository",
+  "id": "13",
+  "assignedTo": null,
+  "logger": null,
+  "type": "error",
+  "annotations": [],
+  "metadata": {
+    "type": "gaierror",
+    "value": "[Errno -2] Name or service not known"
+  },
+  "status": "unresolved",
+  "subscriptionDetails": null,
+  "isPublic": false,
+  "hasSeen": false,
+  "shortId": "INTERNAL-4",
+  "shareId": null,
+  "firstSeen": "2018-12-17T12:00:14Z",
+  "count": "17283712",
+  "permalink": "35.228.54.90/sentry/internal/issues/13/",
+  "level": "error",
+  "isSubscribed": true,
+  "isBookmarked": false,
+  "project": {
+    "slug": "internal",
+    "id": "1",
+    "name": "Internal"
+  },
+  "statusDetails": {}
+}]

spec/fixtures/sentry/issues_sample_response.json

-[{
+[
+  {
     "lastSeen": "2018-12-31T12:00:11Z",
     "numComments": 0,
     "userCount": 0,
@@ -39,4 +40,47 @@
       "name": "Internal"
     },
     "statusDetails": {}
-  }]
+  },
+  {
+    "lastSeen": "2018-12-31T12:00:11Z",
+    "numComments": 0,
+    "userCount": 0,
+    "stats": {
+      "24h": [
+        [
+          1546437600,
+          0
+        ]
+      ]
+    },
+    "culprit": "sentry.tasks.reports.deliver_organization_user_report",
+    "title": "NotFound desc = GetRepoPath: not a git repository",
+    "id": "13",
+    "assignedTo": null,
+    "logger": null,
+    "type": "error",
+    "annotations": [],
+    "metadata": {
+      "type": "gaierror",
+      "value": "GetRepoPath: not a git repository"
+    },
+    "status": "unresolved",
+    "subscriptionDetails": null,
+    "isPublic": false,
+    "hasSeen": false,
+    "shortId": "INTERNAL-4",
+    "shareId": null,
+    "firstSeen": "2018-12-17T12:00:14Z",
+    "count": "17283712",
+    "permalink": "35.228.54.90/sentry/internal/issues/13/",
+    "level": "error",
+    "isSubscribed": true,
+    "isBookmarked": false,
+    "project": {
+      "slug": "internal",
+      "id": "1",
+      "name": "Internal"
+    },
+    "statusDetails": {}
+  }
+]

spec/frontend/error_tracking/components/error_tracking_list_spec.js

@@ -42,9 +42,6 @@ describe('ErrorTrackingList', () => {
         ...stubChildren(ErrorTrackingList),
         ...stubs,
       },
-      data() {
-        return { errorSearchQuery: 'search' };
-      },
     });
   }
@@ -164,8 +161,9 @@ describe('ErrorTrackingList', () => {
       });
       it('it searches by query', () => {
+        findSearchBox().vm.$emit('input', 'search');
         findSearchBox().trigger('keyup.enter');
-        expect(actions.searchByQuery.mock.calls[0][1]).toEqual(wrapper.vm.errorSearchQuery);
+        expect(actions.searchByQuery.mock.calls[0][1]).toBe('search');
       });
       it('it sorts by fields', () => {

spec/frontend/ide/lib/files_spec.js

 import { viewerInformationForPath } from '~/vue_shared/components/content_viewer/lib/viewer_utils';
 import { decorateFiles, splitParent } from '~/ide/lib/files';
 import { decorateData } from '~/ide/stores/utils';
-import { escapeFileUrl } from '~/lib/utils/url_utility';
 const TEST_BRANCH_ID = 'lorem-ipsum';
 const TEST_PROJECT_ID = 10;
@@ -22,7 +21,7 @@ const createEntries = paths => {
         id: path,
         name,
         path,
-        url: createUrl(`/${TEST_PROJECT_ID}/${type}/${TEST_BRANCH_ID}/-/${escapeFileUrl(path)}`),
+        url: createUrl(`/${TEST_PROJECT_ID}/${type}/${TEST_BRANCH_ID}/-/${path}`),
         type,
         previewMode,
         binary: (previewMode && previewMode.binary) || false,

spec/frontend/ide/stores/mutations_spec.js

@@ -494,7 +494,7 @@ describe('Multi-file store mutations', () => {
     it('properly handles files with spaces in name', () => {
       const path = 'my fancy path';
       const newPath = 'new path';
-      const oldEntry = { ...file(path, path, 'blob'), url: `project/-/${encodeURI(path)}` };
+      const oldEntry = { ...file(path, path, 'blob'), url: `project/-/${path}` };
       localState.entries[path] = oldEntry;
@@ -510,12 +510,12 @@ describe('Multi-file store mutations', () => {
         id: newPath,
         path: newPath,
         name: newPath,
-        url: `project/-/new%20path`,
+        url: `project/-/new path`,
         key: expect.stringMatching(newPath),
         prevId: path,
         prevName: path,
         prevPath: path,
-        prevUrl: `project/-/my%20fancy%20path`,
+        prevUrl: `project/-/my fancy path`,
         prevKey: oldEntry.key,
         prevParentPath: oldEntry.parentPath,
       });

spec/frontend/repository/components/breadcrumbs_spec.js

@@ -41,7 +41,7 @@ describe('Repository breadcrumbs component', () => {
         .findAll(RouterLinkStub)
         .at(3)
         .props('to'),
-    ).toEqual('/-/tree//app/assets/javascripts%23');
+    ).toEqual('/-/tree/app/assets/javascripts%23');
   });
   it('renders last link as active', () => {

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

@@ -109,6 +109,26 @@ describe('Repository table row component', () => {
     });
   });
+  it.each`
+    path
+    ${'test#'}
+    ${'Änderungen'}
+  `('renders link for $path', ({ path }) => {
+    factory({
+      id: '1',
+      sha: '123',
+      path,
+      type: 'tree',
+      currentPath: '/',
+    });
+
+    return vm.vm.$nextTick().then(() => {
+      expect(vm.find({ ref: 'link' }).props('to')).toEqual({
+        path: `/-/tree/master/${encodeURIComponent(path)}`,
+      });
+    });
+  });
+
   it('pushes new route for directory with hash', () => {
     factory({
       id: '1',

spec/javascripts/vue_shared/components/file_row_spec.js → spec/frontend/vue_shared/components/file_row_spec.js

-import Vue from 'vue';
-import { file } from 'spec/ide/helpers';
+import { file } from 'jest/ide/helpers';
 import FileRow from '~/vue_shared/components/file_row.vue';
-import mountComponent from '../../helpers/vue_mount_component_helper';
+import FileHeader from '~/vue_shared/components/file_row_header.vue';
+import { shallowMount } from '@vue/test-utils';
+import { nextTick } from 'vue';
+import { escapeFileUrl } from '~/lib/utils/url_utility';
 describe('File row component', () => {
-  let vm;
-  function createComponent(propsData) {
-    const FileRowComponent = Vue.extend(FileRow);
-
-    vm = mountComponent(FileRowComponent, propsData);
+  let wrapper;
+  function createComponent(propsData, $router = undefined) {
+    wrapper = shallowMount(FileRow, {
+      propsData,
+      mocks: {
+        $router,
+      },
+    });
   }
   afterEach(() => {
-    vm.$destroy();
+    wrapper.destroy();
   });
   it('renders name', () => {
+    const fileName = 't4';
     createComponent({
-      file: file('t4'),
+      file: file(fileName),
       level: 0,
     });
-    const name = vm.$el.querySelector('.file-row-name');
-    expect(name.textContent.trim()).toEqual(vm.file.name);
+    const name = wrapper.find('.file-row-name');
+    expect(name.text().trim()).toEqual(fileName);
   });
   it('emits toggleTreeOpen on click', () => {
+    const fileName = 't3';
     createComponent({
       file: {
-        ...file('t3'),
+        ...file(fileName),
         type: 'tree',
       },
       level: 0,
     });
-    spyOn(vm, '$emit').and.stub();
-    vm.$el.click();
-    expect(vm.$emit).toHaveBeenCalledWith('toggleTreeOpen', vm.file.path);
+    jest.spyOn(wrapper.vm, '$emit');
+    wrapper.element.click();
+    expect(wrapper.vm.$emit).toHaveBeenCalledWith('toggleTreeOpen', fileName);
   });
-  it('calls scrollIntoView if made active', done => {
+  it('calls scrollIntoView if made active', () => {
     createComponent({
       file: {
         ...file(),
@@ -52,14 +59,16 @@ describe('File row component', () => {
       level: 0,
     });
-    spyOn(vm, 'scrollIntoView').and.stub();
-
-    vm.file.active = true;
-    vm.$nextTick(() => {
-      expect(vm.scrollIntoView).toHaveBeenCalled();
-      done();
+    jest.spyOn(wrapper.vm, 'scrollIntoView');
+    wrapper.setProps({
+      file: Object.assign({}, wrapper.props('file'), {
+        active: true,
+      }),
+    });
+    return nextTick().then(() => {
+      expect(wrapper.vm.scrollIntoView).toHaveBeenCalled();
     });
   });
@@ -69,7 +78,7 @@ describe('File row component', () => {
       level: 2,
     });
-    expect(vm.$el.querySelector('.file-row-name').style.marginLeft).toBe('32px');
+    expect(wrapper.find('.file-row-name').element.style.marginLeft).toBe('32px');
   });
   it('renders header for file', () => {
@@ -82,6 +91,27 @@ describe('File row component', () => {
       level: 0,
     });
-    expect(vm.$el.classList).toContain('js-file-row-header');
+    expect(wrapper.contains(FileHeader)).toBe(true);
+  });
+
+  it('matches the current route against encoded file URL', () => {
+    const fileName = 'with space';
+    const rowFile = Object.assign({}, file(fileName), {
+      url: `/${fileName}`,
+    });
+    const routerPath = `/project/${escapeFileUrl(fileName)}`;
+    createComponent(
+      {
+        file: rowFile,
+        level: 0,
+      },
+      {
+        currentRoute: {
+          path: routerPath,
+        },
+      },
+    );
+
+    expect(wrapper.vm.hasUrlAtCurrentRoute()).toBe(true);
   });
 });

spec/lib/gitlab/asset_proxy_spec.rb

@@ -33,9 +33,15 @@ describe Gitlab::AssetProxy do
       expect(described_class.proxy_url(url)).to eq(proxied_url)
     end
+    it 'returns original URL for invalid domains' do
+      url = 'foo_bar://'
+
+      expect(described_class.proxy_url(url)).to eq(url)
+    end
+
     context 'whitelisted domain' do
       it 'returns original URL for single domain whitelist' do
-        url = 'http://gitlab.com/test.png'
+        url = 'http://gitlab.com/${default_branch}/test.png'
         expect(described_class.proxy_url(url)).to eq(url)
       end

spec/lib/gitlab/tree_summary_spec.rb

@@ -129,6 +129,17 @@ describe Gitlab::TreeSummary do
         expect(commits).to satisfy_one { |c| c.id == whitespace_commit_sha }
       end
     end
+
+    context 'in a subdirectory with non-ASCII filenames' do
+      let(:path) { 'encoding' }
+
+      it 'returns commits for entries in the subdirectory' do
+        entry = entries.find { |x| x[:file_name] == 'テスト.txt' }
+
+        expect(entry).to be_a(Hash)
+        expect(entry).to include(:commit)
+      end
+    end
   end
   describe '#more?' do

spec/lib/marginalia_spec.rb

@@ -59,7 +59,6 @@ describe 'Marginalia spec' do
         "application"       => "test",
         "controller"        => "marginalia_test",
         "action"            => "first_user",
-        "line"              => "/spec/support/helpers/query_recorder.rb",
         "correlation_id"    => correlation_id
       }
     end
@@ -116,7 +115,6 @@ describe 'Marginalia spec' do
       {
         "application"       => "sidekiq",
         "job_class"         => "MarginaliaTestJob",
-        "line"              => "/spec/support/sidekiq_middleware.rb",
         "correlation_id"    => sidekiq_job['correlation_id'],
         "jid"               => sidekiq_job['jid']
       }
@@ -145,7 +143,6 @@ describe 'Marginalia spec' do
         let(:component_map) do
           {
             "application"  => "sidekiq",
-            "line"         => "/lib/gitlab/i18n.rb",
             "jid"          => delivery_job.job_id,
             "job_class"    => delivery_job.arguments.first
           }

spec/lib/sentry/client/issue_spec.rb

@@ -49,7 +49,7 @@ describe Sentry::Client::Issue do
     it_behaves_like 'calls sentry api'
     it_behaves_like 'issues have correct return type', Gitlab::ErrorTracking::Error
-    it_behaves_like 'issues have correct length', 1
+    it_behaves_like 'issues have correct length', 2
     shared_examples 'has correct external_url' do
       context 'external_url' do
@@ -184,7 +184,7 @@ describe Sentry::Client::Issue do
       it_behaves_like 'calls sentry api'
       it_behaves_like 'issues have correct return type', Gitlab::ErrorTracking::Error
-      it_behaves_like 'issues have correct length', 1
+      it_behaves_like 'issues have correct length', 2
     end
     context 'when cursor is present' do
@@ -194,7 +194,7 @@ describe Sentry::Client::Issue do
       it_behaves_like 'calls sentry api'
       it_behaves_like 'issues have correct return type', Gitlab::ErrorTracking::Error
-      it_behaves_like 'issues have correct length', 1
+      it_behaves_like 'issues have correct length', 2
     end
   end

spec/models/broadcast_message_spec.rb

@@ -65,6 +65,17 @@ describe BroadcastMessage do
       end
     end
+    it 'expires the value if a broadcast message has ended', :request_store do
+      message = create(:broadcast_message, broadcast_type: broadcast_type, ends_at: Time.now.utc + 1.day)
+
+      expect(subject.call).to match_array([message])
+      expect(described_class.cache).to receive(:expire).and_call_original
+
+      Timecop.travel(1.week) do
+        2.times { expect(subject.call).to be_empty }
+      end
+    end
+
     it 'does not create new records' do
       create(:broadcast_message, broadcast_type: broadcast_type)

spec/models/repository_spec.rb

@@ -2366,7 +2366,7 @@ describe Repository do
     end
   end
-  describe '#tree' do
+  shared_examples '#tree' do
     context 'using a non-existing repository' do
       before do
         allow(repository).to receive(:head_commit).and_return(nil)
@@ -2384,10 +2384,17 @@ describe Repository do
     context 'using an existing repository' do
       it 'returns a Tree' do
         expect(repository.tree(:head)).to be_an_instance_of(Tree)
+        expect(repository.tree('v1.1.1')).to be_an_instance_of(Tree)
       end
     end
   end
+  it_behaves_like '#tree'
+
+  describe '#tree? with Rugged enabled', :enable_rugged do
+    it_behaves_like '#tree'
+  end
+
   describe '#size' do
     context 'with a non-existing repository' do
       it 'returns 0' do

spec/support_specs/helpers/active_record/query_recorder_spec.rb

@@ -14,9 +14,6 @@ describe ActiveRecord::QueryRecorder do
         TestQueries.first
       end
-      # Test first_only flag works as expected
-      expect(control.find_query(/.*query_recorder_spec.rb.*/, 0, first_only: true))
-        .to eq(control.find_query(/.*query_recorder_spec.rb.*/, 0).first)
       # Check #find_query
       expect(control.find_query(/.*/, 0).size)
         .to eq(control.data.keys.size)
@@ -32,9 +29,7 @@ describe ActiveRecord::QueryRecorder do
       # Ensure memoization value match the raw value above
       expect(control.count).to eq(control.log.size)
       # Ensure we have only two sources of queries
-      expect(control.data.keys.size).to eq(2)
-      # Ensure we detect only queries from this file
-      expect(control.data.keys.find_all { |i| i.match(/query_recorder_spec.rb/) }.count).to eq(2)
+      expect(control.data.keys.size).to eq(1)
     end
   end
 end

spec/uploaders/import_export_uploader_spec.rb

@@ -51,4 +51,10 @@ describe ImportExportUploader do
       end
     end
   end
+
+  describe '.workhorse_local_upload_path' do
+    it 'returns path that includes uploads dir' do
+      expect(described_class.workhorse_local_upload_path).to end_with('/uploads/tmp/uploads')
+    end
+  end
 end