Merge pull request #1057 from benjaminapetersen/run-on-e2e-setup

Merged by openshift-bot

Author: OpenShift Bot

test/.jshintrc

@@ -1,7 +1,7 @@
 {
   "node": true,
   "browser": true,
-  "esnext": true,
+  "esversion": 6,
   "bitwise": true,
   "camelcase": false,
   "curly": true,
@@ -18,7 +18,9 @@
   "sub" : true,
   "undef": true,
   "unused": true,
+  "expr" : true,
   "globals": {
+    "ace": false,
     "after": false,
     "afterEach": false,
     "afterAll": false,
@@ -32,6 +34,7 @@
     "expect": false,
     "inject": false,
     "it": false,
+    "xit": false,
     "jasmine": false,
     "spyOn": false,
     "hawtioPluginLoader": false,

test/integration/features/user_adds_template_to_project.spec.js

@@ -0,0 +1,66 @@
+'use strict';
+
+require('jasmine-beforeall');
+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');
+//var logger = require('../helpers/logger');
+// TODO: use this to alter whitelist in the tests to support the create from url flow
+// var env = require('../helpers/env');
+
+describe('User adds a template to a project', function() {
+
+  beforeEach(function() {
+    h.commonSetup();
+    h.login();
+    projectHelpers.deleteAllProjects();
+  });
+
+  afterEach(function() {
+    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);
+        createProjectPage.visit();
+        createProjectPage.createProject();
+        var overviewPage = new OverviewPage(project);
+        overviewPage.visit();
+        var catalogPage = overviewPage.clickAddToProject();   // implicit redirect to catalog page
+        catalogPage
+          .processTemplate(JSON.stringify(nodeMongoTemplate))
+          .then(function(createFromTemplatePage) {
+            createFromTemplatePage.clickCreate();             // implicit redirect to overview page
+            // verify we have the 2 deployments in the template
+            var deploymentsPage = new DeploymentsPage(project);
+            deploymentsPage.visit();
+            expect(element(by.cssContainingText('td', 'mongodb')).isPresent()).toBe(true);
+            expect(element(by.cssContainingText('td', 'nodejs-mongodb-example')).isPresent()).toBe(true);
+            // verify we have the two services in the template
+            var servicesPage = new ServicesPage(project);
+            servicesPage.visit();
+            expect(element(by.cssContainingText('td', 'mongodb')).isPresent()).toBe(true);
+            expect(element(by.cssContainingText('td', 'nodejs-mongodb-example')).isPresent()).toBe(true);
+            // verify we have one route for the mongo app
+            var routesPage = new RoutesPage(project);
+            routesPage.visit();
+            expect(element(by.cssContainingText('td', 'nodejs-mongodb-example')).isPresent()).toBe(true);
+          });
+      });
+
+      xit('should save the template in the project catalog', function() {
+        // TODO: same flow as the above test, but use:
+        //    catalogPage.saveTemplate(tpl)
+        // & assert that the template was added to the catalog in this project
+      });
+    });
+  });
+});