Skip to content

Commit e56ff68

Browse files
author
OpenShift Bot
authored
Merge pull request #1195 from rhamilto/run-on-e2e
Merged by openshift-bot
2 parents 35f0730 + 09ea11d commit e56ff68

15 files changed

+643
-92
lines changed

‎test/.jshintrc

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"angular": false,
2828
"by": false,
2929
"before": false,
30+
"beforeAll": false,
3031
"beforeEach": false,
3132
"browser": false,
3233
"describe": false,

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

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
'use strict';
2+
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');
9+
10+
describe('User adds an image stream to a project', function() {
11+
12+
beforeEach(function() {
13+
h.commonSetup();
14+
h.login();
15+
projectHelpers.deleteAllProjects();
16+
});
17+
18+
afterEach(function() {
19+
h.commonTeardown();
20+
});
21+
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);
27+
createProjectPage.visit();
28+
createProjectPage.createProject();
29+
var overviewPage = new OverviewPage(project);
30+
overviewPage.visit();
31+
var catalogPage = overviewPage.clickAddToProject(); // implicit redirect to catalog page
32+
catalogPage
33+
.processImageStream(JSON.stringify(centosImageStream))
34+
.then(function() {
35+
// verify we have the nodejs image stream loaded
36+
var imageStreamsPage = new ImageStreamsPage(project);
37+
imageStreamsPage.visit();
38+
expect(element(by.cssContainingText('td', 'nodejs')).isPresent()).toBe(true); // TODO: use fixture
39+
});
40+
});
41+
});
42+
});
43+
});

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

+24-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
'use strict';
22

3-
require('jasmine-beforeall');
43
var h = require('../helpers');
54
var projectHelpers = require('../helpers/project');
65
var OverviewPage = require('../page-objects/overview').OverviewPage;
@@ -9,9 +8,6 @@ var DeploymentsPage = require('../page-objects/deployments').DeploymentsPage;
98
var ServicesPage = require('../page-objects/services').ServicesPage;
109
var RoutesPage = require('../page-objects/routes').RoutesPage;
1110
var nodeMongoTemplate = require('../fixtures/nodejs-mongodb');
12-
//var logger = require('../helpers/logger');
13-
// TODO: use this to alter whitelist in the tests to support the create from url flow
14-
// var env = require('../helpers/env');
1511

1612
describe('User adds a template to a project', function() {
1713

@@ -42,24 +38,42 @@ describe('User adds a template to a project', function() {
4238
// verify we have the 2 deployments in the template
4339
var deploymentsPage = new DeploymentsPage(project);
4440
deploymentsPage.visit();
45-
expect(element(by.cssContainingText('td', 'mongodb')).isPresent()).toBe(true);
46-
expect(element(by.cssContainingText('td', 'nodejs-mongodb-example')).isPresent()).toBe(true);
41+
expect(element(by.cssContainingText('td', 'mongodb')).isPresent()).toBe(true); // TODO: use fixture
42+
expect(element(by.cssContainingText('td', 'nodejs-mongodb-example')).isPresent()).toBe(true); // TODO: use fixture
4743
// verify we have the two services in the template
4844
var servicesPage = new ServicesPage(project);
4945
servicesPage.visit();
50-
expect(element(by.cssContainingText('td', 'mongodb')).isPresent()).toBe(true);
51-
expect(element(by.cssContainingText('td', 'nodejs-mongodb-example')).isPresent()).toBe(true);
46+
expect(element(by.cssContainingText('td', 'mongodb')).isPresent()).toBe(true); // TODO: use fixture
47+
expect(element(by.cssContainingText('td', 'nodejs-mongodb-example')).isPresent()).toBe(true); // TODO: use fixture
5248
// verify we have one route for the mongo app
5349
var routesPage = new RoutesPage(project);
5450
routesPage.visit();
55-
expect(element(by.cssContainingText('td', 'nodejs-mongodb-example')).isPresent()).toBe(true);
51+
expect(element(by.cssContainingText('td', 'nodejs-mongodb-example')).isPresent()).toBe(true); // TODO: use fixture
5652
});
5753
});
5854

59-
xit('should save the template in the project catalog', function() {
55+
it('should save the template in the project catalog', function() {
6056
// TODO: same flow as the above test, but use:
6157
// catalogPage.saveTemplate(tpl)
6258
// & assert that the template was added to the catalog in this project
59+
var project = projectHelpers.projectDetails();
60+
var createProjectPage = new CreateProjectPage(project);
61+
createProjectPage.visit();
62+
createProjectPage.createProject();
63+
var overviewPage = new OverviewPage(project);
64+
overviewPage.visit();
65+
var catalogPage = overviewPage.clickAddToProject(); // implicit redirect to catalog page
66+
catalogPage
67+
.saveTemplate(JSON.stringify(nodeMongoTemplate))
68+
.then((overview2) => {
69+
var cat2 = overview2.clickAddToProject(); // implicit redirect to catalog page
70+
// once the template processes, we just have to return
71+
// to the catalog and verify the tile exists
72+
cat2.visit();
73+
cat2.clickCategory('JavaScript'); // TODO: pass in the tile name from the template fixture
74+
cat2.findTileBy('Node.js + MongoDB (Ephemeral)', project.name); // TODO: pass in...
75+
expect(element).toBeTruthy();
76+
});
6377
});
6478
});
6579
});

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

+203
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,203 @@
1+
'use strict';
2+
3+
require('jasmine-beforeall');
4+
5+
const h = require('../helpers');
6+
const addExtension = require('../helpers/extensions').addExtension;
7+
const resetExtensions = require('../helpers/extensions').resetExtensions;
8+
const matchersHelpers = require('../helpers/matchers');
9+
const projectHelpers = require('../helpers/project');
10+
const inputsHelpers = require('../helpers/inputs');
11+
const CreateFromURLPage = require('../page-objects/createFromURL').CreateFromURLPage;
12+
const CreateProjectPage = require('../page-objects/createProject').CreateProjectPage;
13+
const CatalogPage = require('../page-objects/catalog').CatalogPage;
14+
const nodeMongoTemplate = require('../fixtures/nodejs-mongodb');
15+
const centosImageStream = require('../fixtures/image-streams-centos7.json');
16+
17+
describe('authenticated e2e-user', function() {
18+
19+
let project = projectHelpers.projectDetails();
20+
let namespaceForFixtures = "template-dumpster";
21+
22+
let setupEnv = function() {
23+
// add namespace to create whitelist for template and image stream
24+
addExtension(`
25+
(function() {
26+
// Update whilelist:
27+
window.OPENSHIFT_CONSTANTS.CREATE_FROM_URL_WHITELIST = ['openshift', '${namespaceForFixtures}'];
28+
})();
29+
`);
30+
let fixturesProject = {name: namespaceForFixtures};
31+
let createProjectPage = new CreateProjectPage(fixturesProject);
32+
createProjectPage.visit();
33+
createProjectPage.createProject();
34+
let catalogPage = new CatalogPage(fixturesProject);
35+
// - add an image stream to that namespace
36+
catalogPage.visit();
37+
catalogPage.processImageStream(JSON.stringify(centosImageStream));
38+
// - add a template to that namespace
39+
catalogPage.visit();
40+
catalogPage.saveTemplate(JSON.stringify(nodeMongoTemplate));
41+
};
42+
43+
beforeAll(function() {
44+
h.commonSetup();
45+
h.login();
46+
projectHelpers.deleteAllProjects();
47+
setupEnv();
48+
});
49+
50+
afterAll(function() {
51+
projectHelpers.deleteAllProjects();
52+
resetExtensions();
53+
h.afterAllTeardown();
54+
});
55+
56+
describe('create from URL', function() {
57+
58+
describe('using an image stream and image stream tag supplied as query string params', function() {
59+
60+
let name = 'nodejs-edited';
61+
let sourceURI = 'https://github.com/openshift/nodejs-ex.git-edited';
62+
let sourceRef = 'master-edited';
63+
let contextDir = '/-edited';
64+
let qs = `?imageStream=nodejs&imageTag=4&name=${name}&sourceURI=${sourceURI}&sourceRef=${sourceRef}&contextDir=${contextDir}&namespace=${namespaceForFixtures}`;
65+
let uri = `project/${project.name}create/fromimage${qs}`;
66+
let heading = 'Node.js 4';
67+
let words = project.name.split(' ');
68+
let timestamp = words[words.length - 1];
69+
70+
it('should display details about the the image', function() {
71+
let createFromURLPage = new CreateFromURLPage();
72+
createFromURLPage.visit(qs);
73+
matchersHelpers.expectHeading(heading);
74+
});
75+
76+
it('should load the image stream in to a newly created project', function(){
77+
let createFromURLPage = new CreateFromURLPage();
78+
createFromURLPage.visit(qs);
79+
createFromURLPage.clickCreateNewProjectTab();
80+
projectHelpers.createProject(project, 'project/' + project['name'] + 'create/fromimage' + qs);
81+
matchersHelpers.expectHeading(heading);
82+
projectHelpers.deleteProject(project);
83+
});
84+
85+
it('should load the image stream in to an existing project and verify the query string params are loaded in to the corresponding form fields', function(){
86+
let createFromURLPage = new CreateFromURLPage();
87+
projectHelpers.visitCreatePage();
88+
projectHelpers.createProject(project);
89+
createFromURLPage.visit(qs);
90+
createFromURLPage.selectExistingProject(timestamp, uri);
91+
matchersHelpers.expectHeading(heading);
92+
let nameInput = element(by.model('name'));
93+
expect(nameInput.getAttribute('value')).toEqual(name);
94+
let sourceURIInput = element(by.model('buildConfig.sourceUrl'));
95+
expect(sourceURIInput.getAttribute('value')).toEqual(sourceURI);
96+
createFromURLPage.clickShowAdvanced();
97+
let sourceRefInput = element(by.model('buildConfig.gitRef'));
98+
expect(sourceRefInput.getAttribute('value')).toEqual(sourceRef);
99+
let contextDirInput = element(by.model('buildConfig.contextDir'));
100+
expect(contextDirInput.getAttribute('value')).toEqual(contextDir);
101+
projectHelpers.deleteProject(project);
102+
});
103+
104+
});
105+
106+
describe('using a template supplied as a query string param', function() {
107+
108+
let sourceURL = "https://github.com/openshift/nodejs-ex.git-edited";
109+
let qs = '?template=nodejs-mongodb-example&templateParamsMap=%7B"SOURCE_REPOSITORY_URL":"' + sourceURL + '"%7D' + '&namespace=' + namespaceForFixtures;
110+
let uri = 'project/' + project.name + 'create/fromtemplate' + qs;
111+
let heading = 'Node.js + MongoDB (Ephemeral)';
112+
let words = project.name.split(' ');
113+
let timestamp = words[words.length - 1];
114+
115+
it('should display details about the template', function() {
116+
let createFromURLPage = new CreateFromURLPage();
117+
createFromURLPage.visit(qs);
118+
matchersHelpers.expectHeading(heading);
119+
});
120+
121+
it('should load the template in to a newly created project', function() {
122+
let createFromURLPage = new CreateFromURLPage();
123+
createFromURLPage.visit(qs);
124+
createFromURLPage.clickCreateNewProjectTab();
125+
projectHelpers.createProject(project, 'project/' + project['name'] + 'create/fromtemplate' + qs);
126+
matchersHelpers.expectHeading(heading);
127+
projectHelpers.deleteProject(project);
128+
});
129+
130+
it('should load the template in an existing project and verify the query string param sourceURL is loaded in to a corresponding form field', function(){
131+
let createFromURLPage = new CreateFromURLPage();
132+
projectHelpers.visitCreatePage();
133+
projectHelpers.createProject(project);
134+
createFromURLPage.visit(qs);
135+
createFromURLPage.selectExistingProject(timestamp, uri);
136+
matchersHelpers.expectHeading(heading);
137+
inputsHelpers
138+
.findValueInInputs(element.all(by.model('parameter.value')), sourceURL)
139+
.then(function(found) {
140+
expect(found).toEqual(sourceURL);
141+
projectHelpers.deleteProject(project);
142+
});
143+
});
144+
145+
});
146+
147+
describe('using a namespace that is not in the whitelist', function() {
148+
it('should display an error about the namespace', function() {
149+
let createFromURLPage = new CreateFromURLPage();
150+
createFromURLPage.visit('?namespace=not-whitelisted');
151+
matchersHelpers.expectAlert('Resources from the namespace "not-whitelisted" are not permitted.');
152+
});
153+
});
154+
155+
describe('using an unavailable image stream supplied as a query string param', function() {
156+
it('should display an error about the image stream', function() {
157+
let createFromURLPage = new CreateFromURLPage();
158+
createFromURLPage.visit('?imageStream=unavailable-imageStream');
159+
matchersHelpers.expectAlert('The requested image stream "unavailable-imageStream" could not be loaded.');
160+
});
161+
});
162+
163+
describe('using an unavailable image tag supplied as a query string param', function() {
164+
it('should display an error about the image tag', function() {
165+
let createFromURLPage = new CreateFromURLPage();
166+
createFromURLPage.visit('?imageStream=nodejs&imageTag=unavailable-imageTag' + '&namespace=' + namespaceForFixtures);
167+
matchersHelpers.expectAlert('The requested image stream tag "unavailable-imageTag" could not be loaded.');
168+
});
169+
});
170+
171+
describe('using an unavailable template supplied as a query string param', function() {
172+
it('should display an error about the template', function() {
173+
let createFromURLPage = new CreateFromURLPage();
174+
createFromURLPage.visit('?template=unavailable-template');
175+
matchersHelpers.expectAlert('The requested template "unavailable-template" could not be loaded.');
176+
});
177+
});
178+
179+
describe('without using an image stream or a template', function() {
180+
it('should display an error about needing a resource', function() {
181+
let createFromURLPage = new CreateFromURLPage();
182+
createFromURLPage.visit('');
183+
matchersHelpers.expectAlert('An image stream or template is required.');
184+
});
185+
});
186+
describe('using both an image stream and a template', function() {
187+
it('should display an error about combining resources', function() {
188+
let createFromURLPage = new CreateFromURLPage();
189+
createFromURLPage.visit('?imageStream=nodejs&template=nodejs-mongodb-example' + '&namespace=' + namespaceForFixtures);
190+
matchersHelpers.expectAlert('Image streams and templates cannot be combined.');
191+
});
192+
});
193+
describe('using an invalid app name as a query string param', function() {
194+
it('should display an error about the app name', function() {
195+
let createFromURLPage = new CreateFromURLPage();
196+
createFromURLPage.visit('?name=InvalidAppName&imageStream=nodejs' + '&namespace=' + namespaceForFixtures);
197+
matchersHelpers.expectAlert('The app name "InvalidAppName" is not valid. An app name is an alphanumeric (a-z, and 0-9) string with a maximum length of 24 characters, where the first character is a letter (a-z), and the \'-\' character is allowed anywhere except the first or last character.');
198+
});
199+
});
200+
201+
});
202+
203+
});

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

+4-19
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
'use strict';
22
/* jshint unused:false */
33

4-
require('jasmine-beforeall');
54
var h = require('../helpers.js');
5+
var projectHelpers = require('../helpers/project.js');
66

77
var goToAddToProjectPage = function(projectName) {
88
var uri = 'project/' + projectName + '/create';
@@ -122,19 +122,11 @@ describe('', function() {
122122

123123
it('should be able to show the create project page', goToCreateProjectPage);
124124

125-
var timestamp = (new Date()).getTime();
126-
var project = {
127-
name: 'console-test-project-' + timestamp,
128-
displayName: 'Console integration test Project ' + timestamp,
129-
description: 'Created by assets/test/integration/rest-api/project.js'
130-
};
125+
var project = projectHelpers.projectDetails();
131126

132127
it('should successfully create a new project', function() {
133128
goToCreateProjectPage();
134-
for (var key in project) {
135-
h.setInputValue(key, project[key]);
136-
}
137-
h.clickAndGo('Create', 'project/' + project['name'] + '/create');
129+
projectHelpers.createProject(project, 'project/' + project['name'] + '/create');
138130
h.waitForPresence('.breadcrumb li a', project['displayName']);
139131
checkProjectSettings(project['name'], project['displayName'], project['description']);
140132
});
@@ -184,14 +176,7 @@ describe('', function() {
184176
});
185177

186178
it('should delete a project', function() {
187-
h.goToPage('/');
188-
var projectTile = element(by.cssContainingText(".project-info", project.displayName));
189-
projectTile.element(by.css('.fa-trash-o')).click();
190-
h.setInputValue('confirmName', project.name);
191-
var deleteButton = element(by.cssContainingText(".modal-dialog .btn", "Delete"));
192-
browser.wait(protractor.ExpectedConditions.elementToBeClickable(deleteButton), 2000);
193-
deleteButton.click();
194-
h.waitForPresence(".alert-success", "marked for deletion");
179+
projectHelpers.deleteProject(project);
195180
});
196181

197182
/*

0 commit comments

Comments
 (0)