Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

e2e test file consistency #1289

Merged
merged 1 commit into from
Mar 3, 2017
Merged

e2e test file consistency #1289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions test/integration/features/user_adds_imagestream_to_project.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
'use strict';

var h = require('../helpers');
var projectHelpers = require('../helpers/project');
var OverviewPage = require('../page-objects/overview').OverviewPage;
var CreateProjectPage = require('../page-objects/createProject').CreateProjectPage;
var ImageStreamsPage = require('../page-objects/imageStreams').ImageStreamsPage;
var centosImageStream = require('../fixtures/image-streams-centos7.json');
const h = require('../helpers');
const projectHelpers = require('../helpers/project');
const OverviewPage = require('../page-objects/overview').OverviewPage;
const CreateProjectPage = require('../page-objects/createProject').CreateProjectPage;
const ImageStreamsPage = require('../page-objects/imageStreams').ImageStreamsPage;
const centosImageStream = require('../fixtures/image-streams-centos7.json');

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

beforeEach(function() {
beforeEach(() => {
h.commonSetup();
h.login();
projectHelpers.deleteAllProjects();
});

afterEach(function() {
afterEach(() => {
h.commonTeardown();
});

describe('after creating a new project', function() {
describe('using the "Import YAML/JSON" tab', function() {
it('should process and create the images in the image stream', function() {
var project = projectHelpers.projectDetails();
var createProjectPage = new CreateProjectPage(project);
describe('after creating a new project', () => {
describe('using the "Import YAML/JSON" tab', () => {
it('should process and create the images in the image stream', () => {
let project = projectHelpers.projectDetails();
let createProjectPage = new CreateProjectPage(project);
createProjectPage.visit();
createProjectPage.createProject();
var overviewPage = new OverviewPage(project);
let overviewPage = new OverviewPage(project);
overviewPage.visit();
var catalogPage = overviewPage.clickAddToProject(); // implicit redirect to catalog page
let catalogPage = overviewPage.clickAddToProject(); // implicit redirect to catalog page
catalogPage
.processImageStream(JSON.stringify(centosImageStream))
.then(function() {
.then(() => {
// verify we have the nodejs image stream loaded
var imageStreamsPage = new ImageStreamsPage(project);
let imageStreamsPage = new ImageStreamsPage(project);
imageStreamsPage.visit();
expect(element(by.cssContainingText('td', 'nodejs')).isPresent()).toBe(true); // TODO: use fixture
});
Expand Down
56 changes: 28 additions & 28 deletions test/integration/features/user_adds_template_to_project.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,72 +1,72 @@
'use strict';

var h = require('../helpers');
var projectHelpers = require('../helpers/project');
var OverviewPage = require('../page-objects/overview').OverviewPage;
var CreateProjectPage = require('../page-objects/createProject').CreateProjectPage;
var DeploymentsPage = require('../page-objects/deployments').DeploymentsPage;
var ServicesPage = require('../page-objects/services').ServicesPage;
var RoutesPage = require('../page-objects/routes').RoutesPage;
var nodeMongoTemplate = require('../fixtures/nodejs-mongodb');
const h = require('../helpers');
const projectHelpers = require('../helpers/project');
const OverviewPage = require('../page-objects/overview').OverviewPage;
const CreateProjectPage = require('../page-objects/createProject').CreateProjectPage;
const DeploymentsPage = require('../page-objects/deployments').DeploymentsPage;
const ServicesPage = require('../page-objects/services').ServicesPage;
const RoutesPage = require('../page-objects/routes').RoutesPage;
const nodeMongoTemplate = require('../fixtures/nodejs-mongodb');

describe('User adds a template to a project', function() {
describe('User adds a template to a project', () => {

beforeEach(function() {
beforeEach(() => {
h.commonSetup();
h.login();
projectHelpers.deleteAllProjects();
});

afterEach(function() {
afterEach(() => {
h.commonTeardown();
});

describe('after creating a new project', function() {
describe('using the "Import YAML/JSON" tab', function() {
it('should process and create the objects in the template', function() {
var project = projectHelpers.projectDetails();
var createProjectPage = new CreateProjectPage(project);
describe('after creating a new project', () => {
describe('using the "Import YAML/JSON" tab', () => {
it('should process and create the objects in the template', () => {
let project = projectHelpers.projectDetails();
let createProjectPage = new CreateProjectPage(project);
createProjectPage.visit();
createProjectPage.createProject();
var overviewPage = new OverviewPage(project);
let overviewPage = new OverviewPage(project);
overviewPage.visit();
var catalogPage = overviewPage.clickAddToProject(); // implicit redirect to catalog page
let catalogPage = overviewPage.clickAddToProject(); // implicit redirect to catalog page
catalogPage
.processTemplate(JSON.stringify(nodeMongoTemplate))
.then(function(createFromTemplatePage) {
.then((createFromTemplatePage) => {
createFromTemplatePage.clickCreate(); // implicit redirect to overview page
// verify we have the 2 deployments in the template
var deploymentsPage = new DeploymentsPage(project);
let deploymentsPage = new DeploymentsPage(project);
deploymentsPage.visit();
expect(element(by.cssContainingText('td', 'mongodb')).isPresent()).toBe(true); // TODO: use fixture
expect(element(by.cssContainingText('td', 'nodejs-mongodb-example')).isPresent()).toBe(true); // TODO: use fixture
// verify we have the two services in the template
var servicesPage = new ServicesPage(project);
let servicesPage = new ServicesPage(project);
servicesPage.visit();
expect(element(by.cssContainingText('td', 'mongodb')).isPresent()).toBe(true); // TODO: use fixture
expect(element(by.cssContainingText('td', 'nodejs-mongodb-example')).isPresent()).toBe(true); // TODO: use fixture
// verify we have one route for the mongo app
var routesPage = new RoutesPage(project);
let routesPage = new RoutesPage(project);
routesPage.visit();
expect(element(by.cssContainingText('td', 'nodejs-mongodb-example')).isPresent()).toBe(true); // TODO: use fixture
});
});

it('should save the template in the project catalog', function() {
it('should save the template in the project catalog', () => {
// TODO: same flow as the above test, but use:
// catalogPage.saveTemplate(tpl)
// & assert that the template was added to the catalog in this project
var project = projectHelpers.projectDetails();
var createProjectPage = new CreateProjectPage(project);
let project = projectHelpers.projectDetails();
let createProjectPage = new CreateProjectPage(project);
createProjectPage.visit();
createProjectPage.createProject();
var overviewPage = new OverviewPage(project);
let overviewPage = new OverviewPage(project);
overviewPage.visit();
var catalogPage = overviewPage.clickAddToProject(); // implicit redirect to catalog page
let catalogPage = overviewPage.clickAddToProject(); // implicit redirect to catalog page
catalogPage
.saveTemplate(JSON.stringify(nodeMongoTemplate))
.then((overview2) => {
var cat2 = overview2.clickAddToProject(); // implicit redirect to catalog page
let cat2 = overview2.clickAddToProject(); // implicit redirect to catalog page
// once the template processes, we just have to return
// to the catalog and verify the tile exists
cat2.visit();
Expand Down
Loading