Skip to content

Commit fb5ff0b

Browse files
author
OpenShift Bot
authoredMar 3, 2017
Merge pull request #1289 from benjaminapetersen/es6-tests
Merged by openshift-bot
·
v3.11.0v3.6.0
2 parents 7529b6f + c4b6f96 commit fb5ff0b

File tree

3 files changed

+95
-95
lines changed

3 files changed

+95
-95
lines changed
 

‎test/integration/features/user_adds_imagestream_to_project.spec.js

+18-18
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
'use strict';
22

3-
var h = require('../helpers');
4-
var projectHelpers = require('../helpers/project');
5-
var OverviewPage = require('../page-objects/overview').OverviewPage;
6-
var CreateProjectPage = require('../page-objects/createProject').CreateProjectPage;
7-
var ImageStreamsPage = require('../page-objects/imageStreams').ImageStreamsPage;
8-
var centosImageStream = require('../fixtures/image-streams-centos7.json');
3+
const h = require('../helpers');
4+
const projectHelpers = require('../helpers/project');
5+
const OverviewPage = require('../page-objects/overview').OverviewPage;
6+
const CreateProjectPage = require('../page-objects/createProject').CreateProjectPage;
7+
const ImageStreamsPage = require('../page-objects/imageStreams').ImageStreamsPage;
8+
const centosImageStream = require('../fixtures/image-streams-centos7.json');
99

10-
describe('User adds an image stream to a project', function() {
10+
describe('User adds an image stream to a project', () => {
1111

12-
beforeEach(function() {
12+
beforeEach(() => {
1313
h.commonSetup();
1414
h.login();
1515
projectHelpers.deleteAllProjects();
1616
});
1717

18-
afterEach(function() {
18+
afterEach(() => {
1919
h.commonTeardown();
2020
});
2121

22-
describe('after creating a new project', function() {
23-
describe('using the "Import YAML/JSON" tab', function() {
24-
it('should process and create the images in the image stream', function() {
25-
var project = projectHelpers.projectDetails();
26-
var createProjectPage = new CreateProjectPage(project);
22+
describe('after creating a new project', () => {
23+
describe('using the "Import YAML/JSON" tab', () => {
24+
it('should process and create the images in the image stream', () => {
25+
let project = projectHelpers.projectDetails();
26+
let createProjectPage = new CreateProjectPage(project);
2727
createProjectPage.visit();
2828
createProjectPage.createProject();
29-
var overviewPage = new OverviewPage(project);
29+
let overviewPage = new OverviewPage(project);
3030
overviewPage.visit();
31-
var catalogPage = overviewPage.clickAddToProject(); // implicit redirect to catalog page
31+
let catalogPage = overviewPage.clickAddToProject(); // implicit redirect to catalog page
3232
catalogPage
3333
.processImageStream(JSON.stringify(centosImageStream))
34-
.then(function() {
34+
.then(() => {
3535
// verify we have the nodejs image stream loaded
36-
var imageStreamsPage = new ImageStreamsPage(project);
36+
let imageStreamsPage = new ImageStreamsPage(project);
3737
imageStreamsPage.visit();
3838
expect(element(by.cssContainingText('td', 'nodejs')).isPresent()).toBe(true); // TODO: use fixture
3939
});

‎test/integration/features/user_adds_template_to_project.spec.js

+28-28
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,72 @@
11
'use strict';
22

3-
var h = require('../helpers');
4-
var projectHelpers = require('../helpers/project');
5-
var OverviewPage = require('../page-objects/overview').OverviewPage;
6-
var CreateProjectPage = require('../page-objects/createProject').CreateProjectPage;
7-
var DeploymentsPage = require('../page-objects/deployments').DeploymentsPage;
8-
var ServicesPage = require('../page-objects/services').ServicesPage;
9-
var RoutesPage = require('../page-objects/routes').RoutesPage;
10-
var nodeMongoTemplate = require('../fixtures/nodejs-mongodb');
3+
const h = require('../helpers');
4+
const projectHelpers = require('../helpers/project');
5+
const OverviewPage = require('../page-objects/overview').OverviewPage;
6+
const CreateProjectPage = require('../page-objects/createProject').CreateProjectPage;
7+
const DeploymentsPage = require('../page-objects/deployments').DeploymentsPage;
8+
const ServicesPage = require('../page-objects/services').ServicesPage;
9+
const RoutesPage = require('../page-objects/routes').RoutesPage;
10+
const nodeMongoTemplate = require('../fixtures/nodejs-mongodb');
1111

12-
describe('User adds a template to a project', function() {
12+
describe('User adds a template to a project', () => {
1313

14-
beforeEach(function() {
14+
beforeEach(() => {
1515
h.commonSetup();
1616
h.login();
1717
projectHelpers.deleteAllProjects();
1818
});
1919

20-
afterEach(function() {
20+
afterEach(() => {
2121
h.commonTeardown();
2222
});
2323

24-
describe('after creating a new project', function() {
25-
describe('using the "Import YAML/JSON" tab', function() {
26-
it('should process and create the objects in the template', function() {
27-
var project = projectHelpers.projectDetails();
28-
var createProjectPage = new CreateProjectPage(project);
24+
describe('after creating a new project', () => {
25+
describe('using the "Import YAML/JSON" tab', () => {
26+
it('should process and create the objects in the template', () => {
27+
let project = projectHelpers.projectDetails();
28+
let createProjectPage = new CreateProjectPage(project);
2929
createProjectPage.visit();
3030
createProjectPage.createProject();
31-
var overviewPage = new OverviewPage(project);
31+
let overviewPage = new OverviewPage(project);
3232
overviewPage.visit();
33-
var catalogPage = overviewPage.clickAddToProject(); // implicit redirect to catalog page
33+
let catalogPage = overviewPage.clickAddToProject(); // implicit redirect to catalog page
3434
catalogPage
3535
.processTemplate(JSON.stringify(nodeMongoTemplate))
36-
.then(function(createFromTemplatePage) {
36+
.then((createFromTemplatePage) => {
3737
createFromTemplatePage.clickCreate(); // implicit redirect to overview page
3838
// verify we have the 2 deployments in the template
39-
var deploymentsPage = new DeploymentsPage(project);
39+
let deploymentsPage = new DeploymentsPage(project);
4040
deploymentsPage.visit();
4141
expect(element(by.cssContainingText('td', 'mongodb')).isPresent()).toBe(true); // TODO: use fixture
4242
expect(element(by.cssContainingText('td', 'nodejs-mongodb-example')).isPresent()).toBe(true); // TODO: use fixture
4343
// verify we have the two services in the template
44-
var servicesPage = new ServicesPage(project);
44+
let servicesPage = new ServicesPage(project);
4545
servicesPage.visit();
4646
expect(element(by.cssContainingText('td', 'mongodb')).isPresent()).toBe(true); // TODO: use fixture
4747
expect(element(by.cssContainingText('td', 'nodejs-mongodb-example')).isPresent()).toBe(true); // TODO: use fixture
4848
// verify we have one route for the mongo app
49-
var routesPage = new RoutesPage(project);
49+
let routesPage = new RoutesPage(project);
5050
routesPage.visit();
5151
expect(element(by.cssContainingText('td', 'nodejs-mongodb-example')).isPresent()).toBe(true); // TODO: use fixture
5252
});
5353
});
5454

55-
it('should save the template in the project catalog', function() {
55+
it('should save the template in the project catalog', () => {
5656
// TODO: same flow as the above test, but use:
5757
// catalogPage.saveTemplate(tpl)
5858
// & assert that the template was added to the catalog in this project
59-
var project = projectHelpers.projectDetails();
60-
var createProjectPage = new CreateProjectPage(project);
59+
let project = projectHelpers.projectDetails();
60+
let createProjectPage = new CreateProjectPage(project);
6161
createProjectPage.visit();
6262
createProjectPage.createProject();
63-
var overviewPage = new OverviewPage(project);
63+
let overviewPage = new OverviewPage(project);
6464
overviewPage.visit();
65-
var catalogPage = overviewPage.clickAddToProject(); // implicit redirect to catalog page
65+
let catalogPage = overviewPage.clickAddToProject(); // implicit redirect to catalog page
6666
catalogPage
6767
.saveTemplate(JSON.stringify(nodeMongoTemplate))
6868
.then((overview2) => {
69-
var cat2 = overview2.clickAddToProject(); // implicit redirect to catalog page
69+
let cat2 = overview2.clickAddToProject(); // implicit redirect to catalog page
7070
// once the template processes, we just have to return
7171
// to the catalog and verify the tile exists
7272
cat2.visit();

0 commit comments

Comments
 (0)
Please sign in to comment.