Skip to content

Commit 36bb41b

Browse files
csm-thucsm-thu
committed
merge: merge branch 'ESAS/new_tenant_warp'
2 parents f48315d + ee1e9ff commit 36bb41b

24 files changed

+110
-430
lines changed

‎config-overrides.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const cspConfigPolicy = {
1111
'*.api.cosmotech.com',
1212
'https://login.microsoftonline.com',
1313
'https://dc.services.visualstudio.com',
14-
'https://scenario-download-brewery-dev.azurewebsites.net',
14+
'https://o-4pm18exqpkv-wabreweryadxdev.azurewebsites.net',
1515
],
1616
'script-src': ["'self'"],
1717
'img-src': ["'self'", 'data:'],

‎cypress/commons/constants/brewery/TestConstants.js‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// Copyright (c) Cosmo Tech.
22
// Licensed under the MIT license.
33

4-
export const BREWERY_WORKSPACE_ID = 'w-70klgqeroooz';
5-
export const REAL_BREWERY_WORKSPACE_ID = 'w-dq0jkrr0k6owl';
4+
export const BREWERY_WORKSPACE_ID = 'w-lzoog8x72dk';
5+
export const REAL_BREWERY_WORKSPACE_ID = 'w-21d727w3gv7';
66

7-
export const DATASET_STORAGE_ACCOUNT = 'csmphoenixdev';
8-
export const DATASET_STORAGE_CONTAINER = 'o-gzypnd27g7';
9-
export const DATASET_STORAGE_REFERENCE_FOLDER = 'demobrewery';
7+
export const DATASET_STORAGE_ACCOUNT = 'warpwaadxdevdlrivo';
8+
export const DATASET_STORAGE_CONTAINER = 'o-4pm18exqpkv';
9+
export const DATASET_STORAGE_REFERENCE_FOLDER = 'brewery_reference';
1010

1111
export const SCENARIO_STATUS = {
1212
CREATED: 'created',
@@ -61,7 +61,6 @@ export const BASIC_PARAMETERS_CONST = {
6161
};
6262

6363
export const DATASET = {
64-
BREWERY_ADT: 'Demo Brewery ADT reference',
6564
BREWERY_STORAGE: 'Demo Brewery Storage reference',
6665
};
6766

‎cypress/commons/constants/generic/TestConstants.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
export { ORGANIZATION_ID } from '../../../../src/config/GlobalConfiguration';
55

6-
export const URL_ROOT = 'https://dev.api.cosmotech.com';
6+
export const URL_ROOT = 'https://warp.api.cosmotech.com/wa-adx-dev/v3';
77
export const AUTH_QUERY_URL =
88
'https://login.microsoftonline.com/e413b834-8be8-4822-a370-be619545cb49/oauth2/v2.0/token';
99
export const GET_EMBED_INFO_ENDPOINT = '/api/get-embed-info';

‎cypress/e2e/brewery/CreateScenario.cy.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ describe('Create scenario', () => {
4040
before(() => {
4141
Login.login();
4242
// Create "another scenarios"
43-
Scenarios.createScenario(otherScenarioName, true, DATASET.BREWERY_ADT, RUN_TEMPLATE.BREWERY_PARAMETERS).then(
43+
Scenarios.createScenario(otherScenarioName, true, DATASET.BREWERY_STORAGE, RUN_TEMPLATE.BREWERY_PARAMETERS).then(
4444
(value) => {
4545
otherScenarioId = value.scenarioCreatedId;
4646
anotherScenarioUrlRegex = new RegExp(`^${URL_ROOT}/.*${PAGE_NAME.SCENARIOS}/${otherScenarioId}`);
@@ -107,7 +107,7 @@ describe('Create scenario', () => {
107107

108108
// Create scenario master:
109109
let scenarioName, scenarioRunTemplateName;
110-
Scenarios.createScenario(scenarioMasterName, true, DATASET.BREWERY_ADT, RUN_TEMPLATE.BREWERY_PARAMETERS).then(
110+
Scenarios.createScenario(scenarioMasterName, true, DATASET.BREWERY_STORAGE, RUN_TEMPLATE.BREWERY_PARAMETERS).then(
111111
(value) => {
112112
scenarioMasterId = value.scenarioCreatedId;
113113
scenarioName = value.scenarioCreatedName;
@@ -249,7 +249,7 @@ describe('Create scenario', () => {
249249
it('can create scenario, edit/discard parameters and switch between parameters tabs', () => {
250250
// Create Scenario with some parameters tabs
251251
let scenarioCreatedName;
252-
Scenarios.createScenario(scenarioWithBasicTypesName, true, DATASET.BREWERY_ADT, RUN_TEMPLATE.BASIC_TYPES).then(
252+
Scenarios.createScenario(scenarioWithBasicTypesName, true, DATASET.BREWERY_STORAGE, RUN_TEMPLATE.BASIC_TYPES).then(
253253
(value) => {
254254
scenarioWithBasicTypesId = value.scenarioCreatedId;
255255
scenarioCreatedName = value.scenarioCreatedName;

‎cypress/e2e/brewery/DescriptionAndTags.cy.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ describe('Scenario tags and description', () => {
6363
Scenarios.createScenario(
6464
scenarioName,
6565
true,
66-
DATASET.BREWERY_ADT,
66+
DATASET.BREWERY_STORAGE,
6767
RUN_TEMPLATE.BREWERY_PARAMETERS,
6868
scenarioDescription,
6969
scenarioTags

‎cypress/e2e/brewery/FileParameters.cy.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Cypress.Keyboard.defaults({
1616
keystrokeDelay: 0,
1717
});
1818

19-
const SCENARIO_DATASET = DATASET.BREWERY_ADT;
19+
const SCENARIO_DATASET = DATASET.BREWERY_STORAGE;
2020
const BASIC_TYPES_RUN_TEMPLATE = RUN_TEMPLATE.BASIC_TYPES;
2121
const BREWERY_RUN_TEMPLATE = RUN_TEMPLATE.BREWERY_PARAMETERS;
2222
const FILE_PATH_1 = 'dummy_dataset_1.csv';

‎cypress/e2e/brewery/NoScenario.cy.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ describe('If there are no scenarios created yet', () => {
3232
Scenarios.switchToScenarioView();
3333
const scenarioName = 'Test Cypress no scenario - ' + utils.randomStr(7);
3434

35-
Scenarios.createScenario(scenarioName, true, DATASET.BREWERY_ADT, RUN_TEMPLATE.BASIC_TYPES).then((value) => {
35+
Scenarios.createScenario(scenarioName, true, DATASET.BREWERY_STORAGE, RUN_TEMPLATE.BASIC_TYPES).then((value) => {
3636
const scenarioId = value.scenarioCreatedId;
3737
ScenarioManager.switchToScenarioManager();
3838
ScenarioManager.getScenarioAccordion(scenarioId).click();

‎cypress/e2e/brewery/RenameScenario.cy.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ describe('Create scenario and rename it', () => {
1111
keystrokeDelay: 0,
1212
});
1313

14-
const SCENARIO_DATASET = DATASET.BREWERY_ADT;
14+
const SCENARIO_DATASET = DATASET.BREWERY_STORAGE;
1515
const SCENARIO_RUN_TEMPLATE = RUN_TEMPLATE.BASIC_TYPES;
1616

1717
function forgeScenarioName() {

‎cypress/e2e/brewery/RunTemplateWithoutParameters.cy.js‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,18 @@ describe('Run templates without parameters', () => {
2222
it('can be created and launched', () => {
2323
const scenarioName = 'Test Cypress - Scenario without parameters - ' + utils.randomStr(7);
2424
scenarioNamesToDelete.push(scenarioName);
25-
Scenarios.createScenario(scenarioName, true, DATASET.BREWERY_ADT, RUN_TEMPLATE.WITHOUT_PARAMETERS).then((value) => {
26-
ScenarioParameters.expandParametersAccordion();
27-
BreweryParameters.getDatasetPartsTab().should('not.exist');
28-
BreweryParameters.getExtraDatasetPartTab().should('not.exist');
29-
BreweryParameters.getBasicTypesTab().should('not.exist');
30-
BreweryParameters.getCustomersTab().should('not.exist');
31-
BreweryParameters.getEventsTab().should('not.exist');
32-
BreweryParameters.getAdditionalParametersTab().should('not.exist');
33-
ScenarioParameters.getNoParametersPlaceholder().should('exist');
34-
ScenarioParameters.launch();
35-
});
25+
Scenarios.createScenario(scenarioName, true, DATASET.BREWERY_STORAGE, RUN_TEMPLATE.WITHOUT_PARAMETERS).then(
26+
(value) => {
27+
ScenarioParameters.expandParametersAccordion();
28+
BreweryParameters.getDatasetPartsTab().should('not.exist');
29+
BreweryParameters.getExtraDatasetPartTab().should('not.exist');
30+
BreweryParameters.getBasicTypesTab().should('not.exist');
31+
BreweryParameters.getCustomersTab().should('not.exist');
32+
BreweryParameters.getEventsTab().should('not.exist');
33+
BreweryParameters.getAdditionalParametersTab().should('not.exist');
34+
ScenarioParameters.getNoParametersPlaceholder().should('exist');
35+
ScenarioParameters.launch();
36+
}
37+
);
3638
});
3739
});

‎cypress/e2e/brewery/ScenarioManager.cy.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ describe('Create scenario and check its data in scenario manager', () => {
4848
ScenarioManager.getScenarioEditableLink(scenarioId).should('have.text', scenarioName);
4949
ScenarioManager.getScenarioRunStatus(scenarioId, SCENARIO_STATUS.CREATED);
5050
ScenarioManager.getScenarioRunTemplate(scenarioId).should('have.text', scenarioRunTemplate);
51-
ScenarioManager.getScenarioDataset(scenarioId).should('have.text', DATASET.BREWERY_ADT, { matchCase: false });
51+
ScenarioManager.getScenarioDataset(scenarioId).should('have.text', DATASET.BREWERY_STORAGE, { matchCase: false });
5252

5353
Scenarios.switchToScenarioView();
5454
ScenarioParameters.launch({ scenarioId, runOptions, saveAndLaunch: true });

0 commit comments

Comments
 (0)