Commit 1a86aa10 authored by Martin Wortschack's avatar Martin Wortschack

Merge branch '327686-update-ee-specs' into 'master'

Update default branch name in ee specs

See merge request gitlab-org/gitlab!60001
parents 468b221d 09821fba
......@@ -12,7 +12,7 @@ export const projects = [
name: 'test',
id: 1,
repository: {
rootRef: 'master',
rootRef: 'main',
},
codeCoveragePath: '#',
codeCoverageSummary: {
......
......@@ -63,7 +63,7 @@ describe('epicUtils', () => {
const tooltipText = epicUtils.getDateFromMilestonesTooltip({
dateType: 'start',
startDateSourcingMilestoneTitle:
'<svg width="100"><use xlink:href="/h5bp/html5-boilerplate/-/raw/master/demo.svg#x" /></svg>',
'<svg width="100"><use xlink:href="/h5bp/html5-boilerplate/-/raw/main/demo.svg#x" /></svg>',
startDateSourcingMilestoneDates: {
startDate: '2020-12-23',
dueDate: '2021-01-28',
......
......@@ -22,7 +22,7 @@ import { scannerProfiles, siteProfiles } from '../mocks/mock_data';
const URL_HOST = 'https://localhost/';
const helpPagePath = '/application_security/dast/index#on-demand-scans';
const projectPath = 'group/project';
const defaultBranch = 'master';
const defaultBranch = 'main';
const profilesLibraryPath = '/security/configuration/dast_scans';
const scannerProfilesLibraryPath = '/security/configuration/dast_scans#scanner-profiles';
const siteProfilesLibraryPath = '/security/configuration/dast_scans#site-profiles';
......
......@@ -43,7 +43,7 @@ describe('Vulnerability Header', () => {
id: 2,
createdAt: new Date().toISOString(),
url: 'pipeline_url',
sourceBranch: 'master',
sourceBranch: 'main',
},
description: 'description',
identifiers: 'identifiers',
......@@ -341,7 +341,7 @@ describe('Vulnerability Header', () => {
});
describe('when the vulnerability is no longer detected on the default branch', () => {
const branchName = 'master';
const branchName = 'main';
beforeEach(() => {
createWrapper({
......
......@@ -5,7 +5,7 @@ import ResolutionAlert, { COOKIE_NAME } from 'ee/vulnerabilities/components/reso
describe('Vulnerability list component', () => {
let wrapper;
const defaultBranchName = 'not-always-master';
const defaultBranchName = 'not-always-main';
const vulnerabilityId = 61;
const createWrapper = (options = {}) => {
......
......@@ -22,7 +22,7 @@ describe('Vulnerability', () => {
id: 2,
created_at: new Date().toISOString(),
url: 'pipeline_url',
sourceBranch: 'master',
sourceBranch: 'main',
},
description: 'description',
identifiers: 'identifiers',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment