Add latest changes from gitlab-org/gitlab@13-3-stable-ee

7 files changed, 148 insertions, 2 deletions

diff --git a/spec/frontend/fixtures/api_merge_requests.rb b/spec/frontend/fixtures/api_merge_requests.rb
new file mode 100644
index 00000000000..f3280e216ff
--- /dev/null
+++ b/spec/frontend/fixtures/api_merge_requests.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe API::MergeRequests, '(JavaScript fixtures)', type: :request do
+  include ApiHelpers
+  include JavaScriptFixturesHelpers
+
+  let(:admin) { create(:admin, name: 'root') }
+  let(:namespace) { create(:namespace, name: 'gitlab-test' )}
+  let(:project) { create(:project, :repository, namespace: namespace, path: 'lorem-ipsum') }
+
+  before(:all) do
+    clean_frontend_fixtures('api/merge_requests')
+  end
+
+  it 'api/merge_requests/get.json' do
+    4.times { |i| create(:merge_request, source_project: project, source_branch: "branch-#{i}") }
+
+    get api("/projects/#{project.id}/merge_requests", admin)
+
+    expect(response).to be_successful
+  end
+end
diff --git a/spec/frontend/fixtures/api_projects.rb b/spec/frontend/fixtures/api_projects.rb
new file mode 100644
index 00000000000..fa77ca1c0cf
--- /dev/null
+++ b/spec/frontend/fixtures/api_projects.rb
@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe API::Projects, '(JavaScript fixtures)', type: :request do
+  include ApiHelpers
+  include JavaScriptFixturesHelpers
+
+  let(:admin) { create(:admin, name: 'root') }
+  let(:namespace) { create(:namespace, name: 'gitlab-test' )}
+  let(:project) { create(:project, :repository, namespace: namespace, path: 'lorem-ipsum') }
+  let(:project_empty) { create(:project_empty_repo, namespace: namespace, path: 'lorem-ipsum-empty') }
+
+  before(:all) do
+    clean_frontend_fixtures('api/projects')
+  end
+
+  it 'api/projects/get.json' do
+    get api("/projects/#{project.id}", admin)
+
+    expect(response).to be_successful
+  end
+
+  it 'api/projects/get_empty.json' do
+    get api("/projects/#{project_empty.id}", admin)
+
+    expect(response).to be_successful
+  end
+
+  it 'api/projects/branches/get.json' do
+    get api("/projects/#{project.id}/repository/branches/#{project.default_branch}", admin)
+
+    expect(response).to be_successful
+  end
+end
diff --git a/spec/frontend/fixtures/freeze_period.rb b/spec/frontend/fixtures/freeze_period.rb
new file mode 100644
index 00000000000..7695dbc2e8f
--- /dev/null
+++ b/spec/frontend/fixtures/freeze_period.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'Freeze Periods (JavaScript fixtures)' do
+  include JavaScriptFixturesHelpers
+  include Ci::PipelineSchedulesHelper
+
+  let_it_be(:admin) { create(:admin) }
+  let_it_be(:project) { create(:project, :repository, path: 'freeze-periods-project') }
+
+  before(:all) do
+    clean_frontend_fixtures('api/freeze-periods/')
+  end
+
+  after(:all) do
+    remove_repository(project)
+  end
+
+  describe API::FreezePeriods, '(JavaScript fixtures)', type: :request do
+    include ApiHelpers
+
+    it 'api/freeze-periods/freeze_periods.json' do
+      create(:ci_freeze_period, project: project, freeze_start: '5 4 * * *', freeze_end: '5 9 * 8 *', cron_timezone: 'America/New_York')
+      create(:ci_freeze_period, project: project, freeze_start: '0 12 * * 1-5', freeze_end: '0 1 5 * *', cron_timezone: 'Etc/UTC')
+      create(:ci_freeze_period, project: project, freeze_start: '0 12 * * 1-5', freeze_end: '0 16 * * 6', cron_timezone: 'Europe/Berlin')
+
+      get api("/projects/#{project.id}/freeze_periods", admin)
+
+      expect(response).to be_successful
+    end
+  end
+
+  describe Ci::PipelineSchedulesHelper, '(JavaScript fixtures)' do
+    let(:response) { timezone_data.to_json }
+
+    it 'api/freeze-periods/timezone_data.json' do
+    end
+  end
+end
diff --git a/spec/frontend/fixtures/merge_requests.rb b/spec/frontend/fixtures/merge_requests.rb
index 7801eb27ce8..6f281b26e6d 100644
--- a/spec/frontend/fixtures/merge_requests.rb
+++ b/spec/frontend/fixtures/merge_requests.rb
@@ -38,6 +38,7 @@ RSpec.describe Projects::MergeRequestsController, '(JavaScript fixtures)', type:
       sha: merge_request.diff_head_sha
     )
   end
+
   let(:path) { "files/ruby/popen.rb" }
   let(:position) do
     build(:text_diff_position, :added,
diff --git a/spec/frontend/fixtures/metrics_dashboard.rb b/spec/frontend/fixtures/metrics_dashboard.rb
index 6ee730f5c3d..eef79825ae7 100644
--- a/spec/frontend/fixtures/metrics_dashboard.rb
+++ b/spec/frontend/fixtures/metrics_dashboard.rb
@@ -8,7 +8,7 @@ RSpec.describe MetricsDashboard, '(JavaScript fixtures)', type: :controller do
 
   let_it_be(:user) { create(:user) }
   let_it_be(:namespace) { create(:namespace, name: 'monitoring' )}
-  let_it_be(:project) { project_with_dashboard_namespace('.gitlab/dashboards/test.yml', namespace: namespace) }
+  let_it_be(:project) { project_with_dashboard_namespace('.gitlab/dashboards/test.yml', nil, namespace: namespace) }
   let_it_be(:environment) { create(:environment, id: 1, project: project) }
   let_it_be(:params) { { environment: environment } }
 
diff --git a/spec/frontend/fixtures/projects_json.rb b/spec/frontend/fixtures/projects_json.rb
new file mode 100644
index 00000000000..c081d4f08dc
--- /dev/null
+++ b/spec/frontend/fixtures/projects_json.rb
@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe 'Projects JSON endpoints (JavaScript fixtures)', type: :controller do
+  include JavaScriptFixturesHelpers
+
+  let(:admin) { create(:admin, name: 'root') }
+  let(:project) { create(:project, :repository) }
+
+  before(:all) do
+    clean_frontend_fixtures('projects_json/')
+  end
+
+  before do
+    project.add_maintainer(admin)
+    sign_in(admin)
+  end
+
+  describe Projects::FindFileController, '(JavaScript fixtures)', type: :controller do
+    it 'projects_json/files.json' do
+      get :list,
+        params: {
+          namespace_id: project.namespace.to_param,
+          project_id: project,
+          id: project.default_branch
+        },
+        format: 'json'
+
+      expect(response).to be_successful
+    end
+  end
+
+  describe Projects::CommitController, '(JavaScript fixtures)', type: :controller do
+    it 'projects_json/pipelines_empty.json' do
+      get :pipelines,
+        params: {
+          namespace_id: project.namespace.to_param,
+          project_id: project,
+          id: project.commit(project.default_branch).id,
+          format: 'json'
+        }
+
+      expect(response).to be_successful
+    end
+  end
+end
diff --git a/spec/frontend/fixtures/test_report.rb b/spec/frontend/fixtures/test_report.rb
index 16496aa901b..3d09078ba68 100644
--- a/spec/frontend/fixtures/test_report.rb
+++ b/spec/frontend/fixtures/test_report.rb
@@ -15,7 +15,6 @@ RSpec.describe Projects::PipelinesController, "(JavaScript fixtures)", type: :co
 
   before do
     sign_in(user)
-    stub_feature_flags(junit_pipeline_view: project)
   end
 
   it "pipelines/test_report.json" do