Add latest changes from gitlab-org/gitlab@master

app/models/integrations/jira.rb

@@ -89,7 +89,6 @@ module Integrations
         site: URI.join(url, '/').to_s.delete_suffix('/'), # Intended to find the root
         context_path: (url.path.presence || '/').delete_suffix('/'),
         auth_type: :basic,
-        read_timeout: 120,
         use_cookies: true,
         additional_cookies: ['OBBasicAuth=fromDialog'],
         use_ssl: url.scheme == 'https'

config/webpack.config.js

@@ -198,6 +198,7 @@ if (!IS_PRODUCTION) {
 
   Object.assign(alias, {
     test_fixtures: path.join(ROOT_PATH, `tmp/tests/frontend/${fixtureDir}`),
+    test_fixtures_static: path.join(ROOT_PATH, 'spec/frontend/fixtures/static'),
     test_helpers: path.join(ROOT_PATH, 'spec/frontend_integration/test_helpers'),
   });
 }

jest.config.base.js

@@ -54,6 +54,7 @@ module.exports = (path, options = {}) => {
     '^helpers(/.*)$': '<rootDir>/spec/frontend/__helpers__$1',
     '^vendor(/.*)$': '<rootDir>/vendor/assets/javascripts$1',
     [TEST_FIXTURES_PATTERN]: '<rootDir>/tmp/tests/frontend/fixtures$1',
+    '^test_fixtures_static(/.*)$': '<rootDir>/spec/frontend/fixtures/static$1',
     '\\.(jpg|jpeg|png|svg|css)$': '<rootDir>/spec/frontend/__mocks__/file_mock.js',
     'emojis(/.*).json': '<rootDir>/fixtures/emojis$1.json',
     '^spec/test_constants$': '<rootDir>/spec/frontend/__helpers__/test_constants',

lib/gitlab/jira/http_client.rb

@@ -32,7 +32,6 @@ module Gitlab
         request_params = { headers: headers }
         request_params[:body] = body if body.present?
         request_params[:headers][:Cookie] = get_cookies if options[:use_cookies]
-        request_params[:timeout] = options[:read_timeout] if options[:read_timeout]
         request_params[:base_uri] = uri.to_s
         request_params.merge!(auth_params)
 

lib/gitlab/zentao/query.rb

@@ -7,8 +7,6 @@ module Gitlab
       ISSUES_DEFAULT_LIMIT = 20
       ISSUES_MAX_LIMIT = 50
 
-      attr_reader :client, :params
-
       def initialize(integration, params)
         @client = Client.new(integration)
         @params = params
@@ -32,6 +30,8 @@ module Gitlab
 
       private
 
+      attr_reader :client, :params
+
       def query_options
         {
           order: query_order,

lib/sidebars/projects/menus/zentao_menu.rb

@@ -6,11 +6,7 @@ module Sidebars
       class ZentaoMenu < ::Sidebars::Menu
         override :configure_menu_items
         def configure_menu_items
-          render?.tap do |render|
-            break unless render
-
-            add_items
-          end
+          render?.tap { |render| add_items if render }
         end
 
         override :link

spec/frontend/deprecated_jquery_dropdown_spec.js

@@ -1,10 +1,9 @@
 /* eslint-disable no-param-reassign */
 
 import $ from 'jquery';
+import mockProjects from 'test_fixtures_static/projects.json';
 import initDeprecatedJQueryDropdown from '~/deprecated_jquery_dropdown';
 import '~/lib/utils/common_utils';
-// eslint-disable-next-line import/no-deprecated
-import { getJSONFixture } from 'helpers/fixtures';
 import { visitUrl } from '~/lib/utils/url_utility';
 
 jest.mock('~/lib/utils/url_utility', () => ({
@@ -68,8 +67,7 @@ describe('deprecatedJQueryDropdown', () => {
     loadFixtures('static/deprecated_jquery_dropdown.html');
     test.dropdownContainerElement = $('.dropdown.inline');
     test.$dropdownMenuElement = $('.dropdown-menu', test.dropdownContainerElement);
-    // eslint-disable-next-line import/no-deprecated
-    test.projectsData = getJSONFixture('static/projects.json');
+    test.projectsData = JSON.parse(JSON.stringify(mockProjects));
   });
 
   afterEach(() => {

spec/frontend/filterable_list_spec.js

@@ -1,5 +1,4 @@
-// eslint-disable-next-line import/no-deprecated
-import { getJSONFixture, setHTMLFixture } from 'helpers/fixtures';
+import { setHTMLFixture } from 'helpers/fixtures';
 import FilterableList from '~/filterable_list';
 
 describe('FilterableList', () => {
@@ -15,8 +14,6 @@ describe('FilterableList', () => {
       </div>
       <div class="js-projects-list-holder"></div>
     `);
-    // eslint-disable-next-line import/no-deprecated
-    getJSONFixture('static/projects.json');
     form = document.querySelector('form#project-filter-form');
     filter = document.querySelector('.js-projects-list-filter');
     holder = document.querySelector('.js-projects-list-holder');

spec/frontend/projects/projects_filterable_list_spec.js

@@ -1,5 +1,4 @@
-// eslint-disable-next-line import/no-deprecated
-import { getJSONFixture, setHTMLFixture } from 'helpers/fixtures';
+import { setHTMLFixture } from 'helpers/fixtures';
 import ProjectsFilterableList from '~/projects/projects_filterable_list';
 
 describe('ProjectsFilterableList', () => {
@@ -15,8 +14,6 @@ describe('ProjectsFilterableList', () => {
       </div>
       <div class="js-projects-list-holder"></div>
     `);
-    // eslint-disable-next-line import/no-deprecated
-    getJSONFixture('static/projects.json');
     form = document.querySelector('form#project-filter-form');
     filter = document.querySelector('.js-projects-list-filter');
     holder = document.querySelector('.js-projects-list-holder');

spec/frontend/vue_shared/components/project_selector/project_list_item_spec.js

@@ -1,6 +1,5 @@
 import { shallowMount, createLocalVue } from '@vue/test-utils';
-// eslint-disable-next-line import/no-deprecated
-import { getJSONFixture } from 'helpers/fixtures';
+import mockProjects from 'test_fixtures_static/projects.json';
 import { trimText } from 'helpers/text_helper';
 import ProjectAvatar from '~/vue_shared/components/deprecated_project_avatar/default.vue';
 import ProjectListItem from '~/vue_shared/components/project_selector/project_list_item.vue';
@@ -13,8 +12,7 @@ describe('ProjectListItem component', () => {
   let vm;
   let options;
 
-  // eslint-disable-next-line import/no-deprecated
-  const project = getJSONFixture('static/projects.json')[0];
+  const project = JSON.parse(JSON.stringify(mockProjects))[0];
 
   beforeEach(() => {
     options = {

spec/frontend/vue_shared/components/project_selector/project_selector_spec.js

@@ -2,8 +2,7 @@ import { GlSearchBoxByType, GlInfiniteScroll } from '@gitlab/ui';
 import { mount, createLocalVue } from '@vue/test-utils';
 import { head } from 'lodash';
 import Vue from 'vue';
-// eslint-disable-next-line import/no-deprecated
-import { getJSONFixture } from 'helpers/fixtures';
+import mockProjects from 'test_fixtures_static/projects.json';
 import { trimText } from 'helpers/text_helper';
 import ProjectListItem from '~/vue_shared/components/project_selector/project_list_item.vue';
 import ProjectSelector from '~/vue_shared/components/project_selector/project_selector.vue';
@@ -13,8 +12,7 @@ const localVue = createLocalVue();
 describe('ProjectSelector component', () => {
   let wrapper;
   let vm;
-  // eslint-disable-next-line import/no-deprecated
-  const allProjects = getJSONFixture('static/projects.json');
+  const allProjects = mockProjects;
   const searchResults = allProjects.slice(0, 5);
   let selected = [];
   selected = selected.concat(allProjects.slice(0, 3)).concat(allProjects.slice(5, 8));

spec/models/integrations/jira_spec.rb

@@ -495,6 +495,18 @@ RSpec.describe Integrations::Jira do
     end
   end
 
+  describe '#client' do
+    it 'uses the default GitLab::HTTP timeouts' do
+      timeouts = Gitlab::HTTP::DEFAULT_TIMEOUT_OPTIONS
+      stub_request(:get, 'http://jira.example.com/foo')
+
+      expect(Gitlab::HTTP).to receive(:httparty_perform_request)
+        .with(Net::HTTP::Get, '/foo', hash_including(timeouts)).and_call_original
+
+      jira_integration.client.get('/foo')
+    end
+  end
+
   describe '#find_issue' do
     let(:issue_key) { 'JIRA-123' }
     let(:issue_url) { "#{url}/rest/api/2/issue/#{issue_key}" }
@@ -503,7 +515,7 @@ RSpec.describe Integrations::Jira do
       stub_request(:get, issue_url).with(basic_auth: [username, password])
     end
 
-    it 'call the Jira API to get the issue' do
+    it 'calls the Jira API to get the issue' do
       jira_integration.find_issue(issue_key)
 
       expect(WebMock).to have_requested(:get, issue_url)

spec/support/database/cross-join-allowlist.yml

@@ -16,9 +16,11 @@
 - "./spec/controllers/groups/settings/ci_cd_controller_spec.rb"
 - "./spec/controllers/projects/settings/ci_cd_controller_spec.rb"
 - "./spec/features/admin/admin_runners_spec.rb"
+- "./spec/features/groups/packages_spec.rb"
 - "./spec/features/ide/user_opens_merge_request_spec.rb"
 - "./spec/features/merge_request/user_sees_merge_request_pipelines_spec.rb"
 - "./spec/features/projects/infrastructure_registry_spec.rb"
+- "./spec/features/projects/packages_spec.rb"
 - "./spec/finders/ci/pipelines_for_merge_request_finder_spec.rb"
 - "./spec/finders/ci/runners_finder_spec.rb"
 - "./spec/frontend/fixtures/runner.rb"
@@ -38,6 +40,7 @@
 - "./spec/presenters/packages/detail/package_presenter_spec.rb"
 - "./spec/requests/api/ci/runner/runners_post_spec.rb"
 - "./spec/requests/api/graphql/ci/runner_spec.rb"
+- "./spec/requests/api/graphql/group/packages_spec.rb"
 - "./spec/requests/api/graphql/group_query_spec.rb"
 - "./spec/requests/api/graphql/packages/composer_spec.rb"
 - "./spec/requests/api/graphql/packages/conan_spec.rb"
@@ -45,12 +48,10 @@
 - "./spec/requests/api/graphql/packages/nuget_spec.rb"
 - "./spec/requests/api/graphql/packages/package_spec.rb"
 - "./spec/requests/api/graphql/packages/pypi_spec.rb"
+- "./spec/requests/api/graphql/project/packages_spec.rb"
 - "./spec/requests/api/package_files_spec.rb"
 - "./spec/services/environments/stop_service_spec.rb"
 - "./spec/services/merge_requests/post_merge_service_spec.rb"
-- "./spec/support/shared_examples/features/packages_shared_examples.rb"
-- "./spec/support/shared_examples/models/concerns/limitable_shared_examples.rb"
-- "./spec/support/shared_examples/requests/api/graphql/packages/group_and_project_packages_list_shared_examples.rb"
-- "./spec/support/shared_examples/requests/api/graphql/packages/package_details_shared_examples.rb"
-- "./spec/support/shared_examples/requests/graphql_shared_examples.rb"
-- "./spec/support/shared_examples/services/packages_shared_examples.rb"
+- "./spec/services/packages/conan/create_package_file_service_spec.rb"
+- "./spec/services/packages/create_package_file_service_spec.rb"
+- "./spec/services/packages/generic/create_package_file_service_spec.rb"

spec/support/database/prevent_cross_joins.rb

@@ -90,13 +90,23 @@ ActiveRecord::Relation.prepend(
 
 ALLOW_LIST = Set.new(YAML.load_file(File.join(__dir__, 'cross-join-allowlist.yml'))).freeze
 
+# Based on https://github.com/rspec/rspec-core/blob/d57c371ee92b16211b80ac7b0b025968438f5297/lib/rspec/core/example.rb#L96-L104,
+# but with file_path
+def example_relative_file_path(example)
+  loaded_spec_files = RSpec.configuration.loaded_spec_files
+
+  RSpec::Core::Metadata.ascending(example.metadata) do |meta|
+    break meta[:file_path] if loaded_spec_files.include?(meta[:absolute_file_path])
+  end
+end
+
 RSpec.configure do |config|
   config.include(::Database::PreventCrossJoins::SpecHelpers)
 
   config.around do |example|
     Thread.current[:has_cross_join_exception] = false
 
-    if ALLOW_LIST.include?(example.file_path)
+    if ALLOW_LIST.include?(example_relative_file_path(example))
       example.run
     else
       with_cross_joins_prevented { example.run }