This is an automated email from the ASF dual-hosted git repository.
ocket8888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new cec6107 Removed (#6359)
cec6107 is described below
commit cec61073e7748f686658771fbabe5531e000c800
Author: dpham <[email protected]>
AuthorDate: Thu Nov 18 16:30:45 2021 -0700
Removed (#6359)
Co-authored-by: Pham, Dandy (Contractor) <[email protected]>
---
.../test/e2e_deprecated/CDNs/cdns-spec.js | 86 -----
.../test/e2e_deprecated/CDNs/pageData.js | 42 --
traffic_portal/test/e2e_deprecated/README.md | 35 --
.../cacheGroups/cache-groups-spec.js | 72 ----
.../test/e2e_deprecated/cacheGroups/pageData.js | 32 --
.../test/e2e_deprecated/common/commonFunctions.js | 47 ---
.../conf-delivery-service-requests.js | 36 --
traffic_portal/test/e2e_deprecated/conf.js | 27 --
traffic_portal/test/e2e_deprecated/conf.json | 35 --
.../delivery-service-requests-spec.js | 150 --------
.../deliveryServiceRequests/pageData.js | 47 ---
.../deliveryServices/delivery-services-spec.js | 421 ---------------------
.../e2e_deprecated/deliveryServices/pageData.js | 55 ---
.../e2e_deprecated/divisions/divisions-spec.js | 70 ----
.../test/e2e_deprecated/divisions/pageData.js | 28 --
.../test/e2e_deprecated/jobs/jobs-spec.js | 55 ---
.../test/e2e_deprecated/jobs/pageData.js | 27 --
.../test/e2e_deprecated/login/login-spec.js | 53 ---
.../test/e2e_deprecated/parameters/pageData.js | 32 --
.../e2e_deprecated/parameters/parameters-spec.js | 77 ----
.../test/e2e_deprecated/physLocations/pageData.js | 34 --
.../physLocations/phys-locations-spec.js | 66 ----
.../test/e2e_deprecated/profiles/pageData.js | 39 --
.../test/e2e_deprecated/profiles/profiles-spec.js | 91 -----
.../test/e2e_deprecated/regions/pageData.js | 29 --
.../test/e2e_deprecated/regions/regions-spec.js | 57 ---
.../e2e_deprecated/serverCapabilities/pageData.js | 28 --
.../serverCapabilities/server-capabilities-spec.js | 71 ----
.../test/e2e_deprecated/servers/pageData.js | 46 ---
.../test/e2e_deprecated/servers/servers-spec.js | 147 -------
.../test/e2e_deprecated/tenants/pageData.js | 25 --
.../test/e2e_deprecated/tenants/tenants-spec.js | 55 ---
.../test/e2e_deprecated/topologies/pageData.js | 36 --
.../e2e_deprecated/topologies/topologies-spec.js | 122 ------
.../test/e2e_deprecated/types/types-spec.js | 46 ---
.../test/e2e_deprecated/users/pageData.js | 34 --
.../test/e2e_deprecated/users/users-spec.js | 134 -------
37 files changed, 2487 deletions(-)
diff --git a/traffic_portal/test/e2e_deprecated/CDNs/cdns-spec.js
b/traffic_portal/test/e2e_deprecated/CDNs/cdns-spec.js
deleted file mode 100644
index 29c68a0..0000000
--- a/traffic_portal/test/e2e_deprecated/CDNs/cdns-spec.js
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-var pd = require('./pageData.js');
-var cfunc = require('../common/commonFunctions.js');
-
-describe('Traffic Portal CDNs Test Suite', function() {
- const pageData = new pd();
- const commonFunctions = new cfunc();
- const myNewCDN = 'cdn-' +
commonFunctions.shuffle('abcdefghijklmonpqrstuvwxyz0123456789');
- const myDomainName = myNewCDN + '.com';
- const mydnssec = false;
-
- it('should go to the CDNs page', function() {
- console.log("Go to the CDNs page");
- browser.setLocation("cdns");
- browser.getCurrentUrl().then(x => console.log(x));
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/cdns");
- });
-
- it('should verify CSV link exists ', function() {
- console.log("Verify CSV button exists");
-
expect(element(by.css('.dt-button.buttons-csv')).isPresent()).toBe(true);
- });
-
- it('should open new CDN form page', function() {
- console.log("Open new CDN form page");
- browser.driver.findElement(by.name('createCdnButton')).click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/cdns/new");
- });
-
- it('should fill out form, create button is enabled and submit',
function () {
- console.log("Filling out form, check create button is enabled
and submit");
- expect(pageData.createButton.isEnabled()).toBe(false);
- pageData.dnssecEnabled.click();
- pageData.dnssecEnabled.sendKeys(mydnssec.toString());
- pageData.name.sendKeys(myNewCDN);
- pageData.domainName.sendKeys(myDomainName);
- expect(pageData.createButton.isEnabled()).toBe(true);
- pageData.createButton.click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/cdns");
- });
-
- it('should verify the new CDN and then update CDN', function() {
- console.log("Verifying the new CDN and then updating CDN");
- browser.sleep(250);
- pageData.searchFilter.sendKeys(myNewCDN);
- browser.sleep(250);
- element.all(by.repeater('cdn in ::cdns')).filter(function(row){
- return
row.element(by.name('name')).getText().then(function(val){
- return val === myNewCDN;
- });
- }).get(0).click();
- browser.sleep(1000);
- pageData.domainName.clear();
- pageData.domainName.sendKeys(myDomainName + 'updated.com');
- pageData.updateButton.click();
-
expect(pageData.domainName.getAttribute('value')).toEqual(myDomainName +
'updated.com');
- });
-
- it('should perform cdn snapshot', function() {
- console.log('Performing cdn snapshot for ' + myNewCDN);
- pageData.diffCDNSnapshotButton.click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toMatch(commonFunctions.urlPath(browser.baseUrl)+"#!/cdns/[0-9]+/config/changes");
- pageData.performCDNSnapshotButton.click();
- pageData.yesButton.click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toMatch(commonFunctions.urlPath(browser.baseUrl)+"#!/cdns/[0-9]+");
- });
-
-});
diff --git a/traffic_portal/test/e2e_deprecated/CDNs/pageData.js
b/traffic_portal/test/e2e_deprecated/CDNs/pageData.js
deleted file mode 100644
index c1c1db8..0000000
--- a/traffic_portal/test/e2e_deprecated/CDNs/pageData.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-module.exports = function(){
- this.name=element(by.name('name'));
- this.domainName=element(by.name('domainName'));
- this.dnssecEnabled=element(by.name('dnssecEnabled'));
- this.createButton=element(by.buttonText('Create'));
- this.deleteButton=element(by.buttonText('Delete'));
- this.updateButton=element(by.buttonText('Update'));
-
this.searchFilter=element(by.id('cdnsTable_filter')).element(by.css('label
input'));
- this.deletePermanentlyButton=element(by.buttonText('Delete
Permanently'));
- this.moreButton=element(by.buttonText('More'));
- this.manageDnssecKeysButton=element(by.linkText('Manage DNSSEC Keys'));
- this.generateDnssecKeysButton=element(by.buttonText('Generate DNSSEC
Keys'));
- this.diffCDNSnapshotButton=element(by.name('diffCDNbtn'));
- this.performCDNSnapshotButton=element(by.name('snapshotCDNbtn'));
- this.kskExpirationDays=element(by.name('kskExpirationDays'));
- this.regenerateButton=element(by.buttonText('Regenerate'));
-
this.confirmInput=element(by.name('confirmEnterForm')).element(by.tagName('input'));
- this.yesButton=element(by.buttonText('Yes'));
- this.expirationDate=element(by.name('expirationDate'));
- this.regenerateDnssecKeysButton=element(by.buttonText('Regenerate
DNSSEC Keys'));
- this.regenerateKskButton=element(by.buttonText('Regenerate KSK'));
- this.generateButton=element(by.buttonText('Generate'));
-};
\ No newline at end of file
diff --git a/traffic_portal/test/e2e_deprecated/README.md
b/traffic_portal/test/e2e_deprecated/README.md
deleted file mode 100644
index ceb4106..0000000
--- a/traffic_portal/test/e2e_deprecated/README.md
+++ /dev/null
@@ -1,35 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-# Deprecated TP UI Tests
-*Use /traffic_portal/integration for new tests*
-
-The Traffic Portal UI tests use
[Protractor](https://www.protractortest.org/#/tutorial), which thus must be
installed prior to their execution. To run them, follow these steps:
-
-1. Start up Selenium Server - typically done with `webdriver-manager start`
-1. Make sure Traffic Portal is running (see [the official
documentation](https://traffic-control-cdn.readthedocs.io/en/latest/admin/traffic_portal/installation.html))
-1. Edit [conf.js](./conf.js) if necessary to match the environment (most
notably ensure the port numbers match those in
([../conf/conf.js](../conf/conf.js) and that the login credentials are correct).
-1. Run the tests - typically done with `protractor conf.js`
-
-## Errors with webdriver
-Most errors with webdriver can be remedied by running:
-```shellsession
-$ webdriver-manager clean
-$ webdriver-manager update
-```
diff --git
a/traffic_portal/test/e2e_deprecated/cacheGroups/cache-groups-spec.js
b/traffic_portal/test/e2e_deprecated/cacheGroups/cache-groups-spec.js
deleted file mode 100644
index 490fb14..0000000
--- a/traffic_portal/test/e2e_deprecated/cacheGroups/cache-groups-spec.js
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-var pd = require('./pageData.js');
-var cfunc = require('../common/commonFunctions.js');
-
-describe('Traffic Portal Cache Groups Test Suite', function() {
- const pageData = new pd();
- const commonFunctions = new cfunc();
- const myNewCG = {
- name: 'cache-group-' +
commonFunctions.shuffle('abcdefghijklmonpqrstuvwxyz0123456789'),
- latitude: 45,
- longitude: 45
- };
-
- it('should go to the cache groups page', function() {
- console.log("Go to the cache groups page");
- browser.setLocation("cache-groups");
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/cache-groups");
- });
-
- it('should verify CSV link exists ', function() {
- console.log("Verify CSV button exists");
-
expect(element(by.css('.dt-button.buttons-csv')).isPresent()).toBe(true);
- });
-
- it('should open new cache group form page', function() {
- console.log("Open new cache groups form page");
-
browser.driver.findElement(by.name('createCacheGroupButton')).click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/cache-groups/new");
- });
-
- it('should fill out form, create button is enabled and submit',
function () {
- console.log("Filling out form, check create button is enabled
and submit");
- expect(pageData.createButton.isEnabled()).toBe(false);
- pageData.name.sendKeys(myNewCG.name);
- pageData.shortName.sendKeys(myNewCG.name);
- commonFunctions.selectDropdownbyNum(pageData.type, 1);
- pageData.latitude.sendKeys(myNewCG.latitude);
- pageData.longitude.sendKeys(myNewCG.longitude);
- expect(pageData.createButton.isEnabled()).toBe(true);
- pageData.createButton.click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/cache-groups");
- });
-
- it('should toggle the visibility of the first table column ',
function() {
- browser.driver.findElement(by.id('toggleColumns')).click();
- let first = element.all(by.css('input[type=checkbox]')).first();
- expect(first.isSelected()).toBe(true);
- first.click();
- expect(first.isSelected()).toBe(false);
- let tableColumns = element.all(by.css('#cacheGroupsTable
tr:first-child th'));
- expect(tableColumns.count()).toBe(6);
- });
-
-});
diff --git a/traffic_portal/test/e2e_deprecated/cacheGroups/pageData.js
b/traffic_portal/test/e2e_deprecated/cacheGroups/pageData.js
deleted file mode 100644
index 6176af9..0000000
--- a/traffic_portal/test/e2e_deprecated/cacheGroups/pageData.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-module.exports = function(){
- this.name=element(by.name('name'));
- this.shortName=element(by.name('shortName'));
- this.type=element(by.name('type'));
- this.latitude=element(by.name('latitude'));
- this.longitude=element(by.name('longitude'));
- this.createButton=element(by.buttonText('Create'));
- this.deleteButton=element(by.buttonText('Delete'));
- this.updateButton=element(by.buttonText('Update'));
-
this.searchFilter=element(by.id('cacheGroupsTable_filter')).element(by.css('label
input'));
- this.confirmWithNameInput=element(by.name('confirmWithNameInput'));
- this.deletePermanentlyButton=element(by.buttonText('Delete
Permanently'));
-};
diff --git a/traffic_portal/test/e2e_deprecated/common/commonFunctions.js
b/traffic_portal/test/e2e_deprecated/common/commonFunctions.js
deleted file mode 100644
index 7af4201..0000000
--- a/traffic_portal/test/e2e_deprecated/common/commonFunctions.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-module.exports = function() {
- // selectDropdownbyNum - pass in the <SELECT> element and a option
number, typically 1
- this.selectDropdownbyNum = function ( element, optionNum ) {
- if (optionNum){
- element.all(by.tagName('option'))
- .then(function(options){
- options[optionNum].click();
- });
- }
- };
-
- this.urlPath = function ( url ) {
- return '/' + String(url).split('/').slice(3).join('/');
- };
-
- this.shuffle = (string) => {
- return [...string].sort(
- (a, b) => {
- return Math.floor(Math.random() * 3) - 1;
- }
- ).join("");
- }
-
- this.random = (max) => {
- return Math.round(Math.random() * max);
- }
-
-};
diff --git
a/traffic_portal/test/e2e_deprecated/conf-delivery-service-requests.js
b/traffic_portal/test/e2e_deprecated/conf-delivery-service-requests.js
deleted file mode 100644
index b9efd93..0000000
--- a/traffic_portal/test/e2e_deprecated/conf-delivery-service-requests.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-exports.config = {
- framework: 'jasmine',
- seleniumAddress: 'http://localhost:4444/wd/hub',
- specs: ['login/login-spec.js',
'DeliveryServiceRequests/delivery-service-requests-spec.js'],
- baseUrl: 'https://localhost:4443',
- getPageTimeout: 30000,
-
- capabilities: {
- 'browserName': 'chrome'
- },
- params: {
- adminUser: 'admin',
- adminPassword: 'twelve'
- },
- jasmineNodeOpts: {defaultTimeoutInterval: 600000},
-
-};
diff --git a/traffic_portal/test/e2e_deprecated/conf.js
b/traffic_portal/test/e2e_deprecated/conf.js
deleted file mode 100644
index 3590f03..0000000
--- a/traffic_portal/test/e2e_deprecated/conf.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-const fs = require('fs');
-const path = require('path');
-
-exports.config = JSON.parse(
- fs.readFileSync(
- path.join(process.cwd(), 'conf.json')
- ).toString()
-);
diff --git a/traffic_portal/test/e2e_deprecated/conf.json
b/traffic_portal/test/e2e_deprecated/conf.json
deleted file mode 100644
index b5bb3f8..0000000
--- a/traffic_portal/test/e2e_deprecated/conf.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
- "baseUrl": "https://localhost:4443";,
- "capabilities": {
- "acceptInsecureCerts": true,
- "browserName": "chrome"
- },
- "framework": "jasmine",
- "getPageTimeout": 30000,
- "jasmineNodeOpts": {
- "defaultTimeoutInterval": 600000
- },
- "params": {
- "adminPassword": "twelve12",
- "adminUser": "admin"
- },
- "seleniumAddress": "http://localhost:4444/wd/hub";,
- "suites": {
- "allTests": [
- "login/login-spec.js",
- "CDNs/cdns-spec.js",
- "cacheGroups/cache-groups-spec.js",
- "profiles/profiles-spec.js",
- "divisions/divisions-spec.js",
- "regions/regions-spec.js",
- "physLocations/phys-locations-spec.js",
- "serverCapabilities/server-capabilities-spec.js",
- "servers/servers-spec.js",
- "topologies/topologies-spec.js",
- "deliveryServices/delivery-services-spec.js",
- "jobs/jobs-spec.js",
- "tenants/tenants-spec.js",
- "users/users-spec.js"
- ]
- }
-}
diff --git
a/traffic_portal/test/e2e_deprecated/deliveryServiceRequests/delivery-service-requests-spec.js
b/traffic_portal/test/e2e_deprecated/deliveryServiceRequests/delivery-service-requests-spec.js
deleted file mode 100644
index 2b4d57c..0000000
---
a/traffic_portal/test/e2e_deprecated/deliveryServiceRequests/delivery-service-requests-spec.js
+++ /dev/null
@@ -1,150 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-var pd = require('./pageData.js');
-var cfunc = require('../common/commonFunctions.js');
-
-describe('Traffic Portal Delivery Service Requests', function() {
-
- const pageData = new pd();
- const commonFunctions = new cfunc();
- const mockVals = {
- dsType: ["ANY MAP", "DNS", "HTTP", "STEERING"],
- active: "Active",
- xmlId: "xml-id-" +
commonFunctions.shuffle('abcdefghijklmonpqrstuvwxyz'),
- displayName: "dsTest",
- orgServerFqdn: "http://dstest.com";,
- longDesc: "This is only a test that should be disposed of by
Automated UI Testing.",
- commentInput: "This is the second comment"
- };
-
- it('should open ds services page and click button to create a new one',
function() {
- console.log('Opening delivery service requests page');
- browser.setLocation("delivery-services");
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/delivery-services");
- });
-
- it('should create and select type of ds from the dropdown and confirm',
function() {
- console.log('Clicked Create New and selecting a type');
-
browser.driver.findElement(by.name('createDeliveryServiceButton')).click();
- browser.sleep(1000);
- expect(pageData.selectFormSubmitButton.isEnabled()).toBe(false);
-
browser.driver.findElement(by.name('selectFormDropdown')).sendKeys(mockVals.dsType[1]);
- browser.sleep(250);
- expect(pageData.selectFormSubmitButton.isEnabled()).toBe(true);
- pageData.selectFormSubmitButton.click();
- });
-
- it('should populate and submit the ds form', function() {
- console.log('Filling out form for ' + mockVals.xmlId);
- browser.sleep(250);
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/delivery-services/new?type="
+ mockVals.dsType[1]);
- expect(pageData.createButton.isEnabled()).toBe(false);
- pageData.active.click();
- pageData.active.sendKeys(mockVals.active);
- commonFunctions.selectDropdownbyNum(pageData.type, 1);
- pageData.xmlId.sendKeys(mockVals.xmlId);
- pageData.displayName.sendKeys(mockVals.displayName);
- commonFunctions.selectDropdownbyNum(pageData.tenantId, 1);
- commonFunctions.selectDropdownbyNum(pageData.cdn, 1);
- pageData.orgServerFqdn.sendKeys(mockVals.orgServerFqdn);
- commonFunctions.selectDropdownbyNum(pageData.protocol, 1);
- pageData.longDesc.sendKeys(mockVals.longDesc);
- expect(pageData.createButton.isEnabled()).toBe(true);
- pageData.createButton.click();
- browser.sleep(250);
- });
-
- it('should select a status from the dropdown and add comment before
submitting', function() {
- browser.sleep(250);
- commonFunctions.selectDropdownbyNum(pageData.requestStatus, 2);
- pageData.dialogComment.sendKeys('This is comment one');
- browser.sleep(250);
- expect(pageData.dialogSubmit.isEnabled()).toBe(true);
- pageData.dialogSubmit.click();
- browser.sleep(250);
- });
-
- it('should redirect to delivery-service-requests page', function() {
- console.log('Backing out and verifying ' + mockVals.xmlId + '
exists');
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/delivery-service-requests");
- });
-
- it('should open up and update the ds', function() {
- console.log('Updating the form for ' + mockVals.xmlId);
- browser.sleep(250);
- element.all(by.repeater('request in
::dsRequests')).filter(function(row){
- return
row.element(by.name('xmlId')).getText().then(function(val){
- console.log(val + " this is my val " +
mockVals.xmlId);
- return val.toString() ===
mockVals.xmlId.toString();
- });
- }).get(0).click();
- browser.sleep(250);
- expect(pageData.updateButton.isEnabled()).toBe(false);
- pageData.displayName.sendKeys(mockVals.displayName + "updated");
- expect(pageData.updateButton.isEnabled()).toBe(true);
- pageData.updateButton.click();
- browser.sleep(250);
- expect(pageData.displayName.getText() === mockVals.displayName
+ "updated");
- });
-
- it('should select a status from the dropdown and add comment before
submitting', function() {
- browser.sleep(250);
- commonFunctions.selectDropdownbyNum(pageData.requestStatus, 2);
- pageData.dialogComment.sendKeys('This is comment two');
- browser.sleep(250);
- expect(pageData.dialogSubmit.isEnabled()).toBe(true);
- pageData.dialogSubmit.click();
- browser.sleep(250);
- });
-
- it('should add a comment', function () {
- console.log('Adding Comment');
- pageData.newCommentButton.click();
- browser.sleep(250);
- pageData.commentInput.sendKeys(mockVals.commentInput);
- pageData.createCommentButton.click();
- });
-
- it('should edit a comment', function () {
- console.log('Editing Comment');
- browser.sleep(250);
- element.all(by.css('.link.action-link')).first().click();
- browser.sleep(250);
- pageData.commentInput.sendKeys(mockVals.commentInput);
- pageData.updateCommentButton.click();
- });
-
- it('should delete a comment', function () {
- console.log('Deleting Comment');
- browser.sleep(250);
- element.all(by.css('.link.action-link')).get(1).click();
- browser.sleep(250);
- pageData.yesButton.click();
- });
-
- it('should delete the ds request', function() {
- console.log('Deleting ' + mockVals.xmlId);
- pageData.deleteButton.click();
- pageData.confirmWithNameInput.sendKeys(mockVals.xmlId + '
request');
- pageData.deletePermanentlyButton.click();
- browser.sleep(250);
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/delivery-service-requests");
- });
-});
diff --git
a/traffic_portal/test/e2e_deprecated/deliveryServiceRequests/pageData.js
b/traffic_portal/test/e2e_deprecated/deliveryServiceRequests/pageData.js
deleted file mode 100644
index 0a74753..0000000
--- a/traffic_portal/test/e2e_deprecated/deliveryServiceRequests/pageData.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-module.exports = function(){
- this.selectFormSubmitButton=element(by.buttonText('Submit'));
- this.active=element(by.name('active'));
- this.type=element(by.name('type'));
- this.xmlId=element(by.name('xmlId'));
- this.displayName=element(by.name('displayName'));
- this.tenantId=element(by.name('tenantId'));
- this.cdn=element(by.name('cdn'));
- this.orgServerFqdn=element(by.name('orgServerFqdn'));
- this.protocol=element(by.name('protocol'));
- this.longDesc=element(by.name('longDesc'));
- this.requestStatus=element(by.name('requestStatus'));
- this.createButton=element(by.buttonText('Create'));
- this.deleteButton=element(by.buttonText('Delete Request'));
- this.updateButton=element(by.buttonText('Update Request'));
- this.fulfillButton=element(by.buttonText('Fulfill Request'));
- this.confirmWithNameInput=element(by.name('confirmWithNameInput'));
- this.dialogComment=element(by.name('comment'));
- this.dialogSubmit=element(by.buttonText('Submit'));
- this.newCommentButton=element(by.name('createComment'));
- this.editCommentButton=element(by.name('editComment'));
- this.deleteCommentButton=element(by.name('deleteComment'));
- this.updateCommentButton=element(by.buttonText('Update Comment'));
- this.yesButton=element(by.buttonText('Yes'));
- this.commentInput=element(by.name('text'));
- this.createCommentButton=element(by.buttonText('Create Comment'));
- this.deletePermanentlyButton=element(by.buttonText('Delete
Permanently'));
-};
\ No newline at end of file
diff --git
a/traffic_portal/test/e2e_deprecated/deliveryServices/delivery-services-spec.js
b/traffic_portal/test/e2e_deprecated/deliveryServices/delivery-services-spec.js
deleted file mode 100644
index e52d96b..0000000
---
a/traffic_portal/test/e2e_deprecated/deliveryServices/delivery-services-spec.js
+++ /dev/null
@@ -1,421 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-var pd = require('./pageData.js');
-var cfunc = require('../common/commonFunctions.js');
-
-describe('Traffic Portal Delivery Services Suite', function() {
-
- const pageData = new pd();
- const commonFunctions = new cfunc();
- const ec = protractor.ExpectedConditions;
- const mockVals = {
- dsTypes: {
- anyMap: [
- "ANY_MAP"
- ],
- dns: [
- "DNS",
- "DNS_LIVE_NATNL",
- "DNS_LIVE"
- ],
- http: [
- "HTTP",
- "HTTP_NO_CACHE",
- "HTTP_LIVE",
- "HTTP_LIVE_NATNL"
- ],
- steering: [
- "STEERING",
- "CLIENT_STEERING"
- ]
- },
- anyMapXmlId: "any-map-xml-id-" +
commonFunctions.shuffle('abcdefghijklmonpqrstuvwxyz'),
- dnsXmlId: "dns-xml-id-" +
commonFunctions.shuffle('abcdefghijklmonpqrstuvwxyz'),
- httpXmlId: "http-xml-id-" +
commonFunctions.shuffle('abcdefghijklmonpqrstuvwxyz'),
- steeringXmlId: "http-xml-id-" +
commonFunctions.shuffle('abcdefghijklmonpqrstuvwxyz'),
- longDesc: "This is only a test delivery service that should be
disposed of by Automated UI Testing.",
- staticDNShostName: "static-dns-xml-id-" +
commonFunctions.shuffle('abcdefghijklmonpqrstuvwxyz'),
- staticDNSTTL: 0,
- staticDNSAddress: "cdn.test.com."
- };
-
- it('should open delivery services page', function() {
- console.log('Opening delivery services page');
- browser.setLocation("delivery-services");
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/delivery-services");
- });
-
- // ANY_MAP delivery service
-
- it('should click new delivery service and select ANY_MAP category from
the dropdown', function() {
- console.log('Clicked Create New and selecting ANY_MAP');
- pageData.moreBtn.click();
- pageData.createDSMenuItem.click();
- expect(pageData.selectFormSubmitButton.isEnabled()).toBe(false);
-
browser.driver.findElement(by.name('selectFormDropdown')).sendKeys('ANY_MAP');
- expect(pageData.selectFormSubmitButton.isEnabled()).toBe(true);
- pageData.selectFormSubmitButton.click();
- });
-
- it('should populate and submit the delivery service form', function() {
- console.log('Creating a DS for ' + mockVals.anyMapXmlId);
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/delivery-services/new?type=ANY_MAP");
- expect(pageData.createButton.isEnabled()).toBe(false);
- // set required fields
- // set xml id
- pageData.xmlId.sendKeys(mockVals.anyMapXmlId);
- // set display name
- pageData.displayName.sendKeys(mockVals.anyMapXmlId);
- // set active status
- pageData.active.click();
- pageData.active.sendKeys('Active');
- // set content routing type
- pageData.type.click();
- pageData.type.sendKeys(mockVals.dsTypes.anyMap[0]);
- // set tenant
- commonFunctions.selectDropdownbyNum(pageData.tenantId, 1);
- // set cdn
- commonFunctions.selectDropdownbyNum(pageData.cdn, 1);
- // set raw remap text
- pageData.remapText.sendKeys('raw remap text');
- // all required fields have been set, create button should be
enabled
- expect(pageData.createButton.isEnabled()).toBe(true);
- pageData.createButton.click();
- browser.sleep(1000);
- expect($('div.alert-success').isDisplayed()).toBe(true);
- });
-
- it('should toggle the visibility of the first table column ',
function() {
- console.log("Toggling visiblity of column");
- browser.setLocation("delivery-services");
- browser.sleep(1000);
- browser.driver.findElement(by.id('toggleColumns')).click();
- let first = element.all(by.css('input[type=checkbox]')).first();
- expect(first.isSelected()).toBe(true);
- first.click();
- expect(first.isSelected()).toBe(false);
- let tableColumns = element.all(by.css('.ag-header-cell'));
- expect(tableColumns.count()).toBe(9);
- });
-
- it('should verify the new ANY_MAP delivery service and update it',
function() {
- console.log('Updating the ANY_MAP delivery service for ' +
mockVals.anyMapXmlId);
- browser.sleep(1000);
- let row = element(by.cssContainingText('.ag-cell',
mockVals.anyMapXmlId));
- browser.actions().click(row).perform();
- browser.sleep(1000);
- expect(pageData.updateButton.isEnabled()).toBe(false);
- expect(pageData.xmlId.getAttribute('readonly')).toBe('true');
- pageData.displayName.clear().then(function() {
- pageData.displayName.sendKeys("Updated display name");
- });
- expect(pageData.updateButton.isEnabled()).toBe(true);
- pageData.updateButton.click();
- expect(pageData.displayName.getText() === "Updated display
name");
- });
-
- it('should delete the ANY_MAP delivery service', function() {
- console.log('Deleting ' + mockVals.anyMapXmlId);
- pageData.deleteButton.click();
- pageData.confirmWithNameInput.sendKeys(mockVals.anyMapXmlId);
- pageData.deletePermanentlyButton.click();
- expect($('div.alert-success').isDisplayed()).toBe(true);
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/delivery-services");
- });
-
- // DNS delivery service
-
- it('should click new delivery service and select DNS category from the
dropdown', function() {
- console.log('Clicked Create New and selecting DNS');
- pageData.moreBtn.click();
- pageData.createDSMenuItem.click();
- expect(pageData.selectFormSubmitButton.isEnabled()).toBe(false);
-
browser.driver.findElement(by.name('selectFormDropdown')).sendKeys('DNS');
- expect(pageData.selectFormSubmitButton.isEnabled()).toBe(true);
- pageData.selectFormSubmitButton.click();
- });
-
- it('should populate and submit the ds form', function() {
- console.log('Creating a DS for ' + mockVals.dnsXmlId);
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/delivery-services/new?type=DNS");
- expect(pageData.createButton.isEnabled()).toBe(false);
- // set required fields
- // set xml id
- pageData.xmlId.sendKeys(mockVals.dnsXmlId);
- // set display name
- pageData.displayName.sendKeys(mockVals.dnsXmlId);
- // set active status
- pageData.active.click();
- pageData.active.sendKeys('Active');
- // set content routing type
- pageData.type.click();
- pageData.type.sendKeys(mockVals.dsTypes.dns[0]);
- // set tenant
- commonFunctions.selectDropdownbyNum(pageData.tenantId, 1);
- // set cdn
- commonFunctions.selectDropdownbyNum(pageData.cdn, 1);
- // set origin server
- pageData.orgServerFqdn.sendKeys('http://' + mockVals.dnsXmlId +
'.com');
- // set protocol
- commonFunctions.selectDropdownbyNum(pageData.protocol, 1);
- // all required fields have been set, create button should be
enabled
- expect(pageData.createButton.isEnabled()).toBe(true);
- pageData.createButton.click();
- browser.sleep(1000);
- expect($('div.alert-success').isDisplayed()).toBe(true);
- });
-
- it('should update the DNS delivery service', function() {
- console.log('Updating the DNS delivery service for ' +
mockVals.dnsXmlId);
- browser.setLocation("delivery-services");
- browser.sleep(1000);
- let row = element(by.cssContainingText('.ag-cell',
mockVals.dnsXmlId));
- browser.actions().click(row).perform();
- browser.sleep(1000);
- expect(pageData.updateButton.isEnabled()).toBe(false);
- expect(pageData.xmlId.getAttribute('readonly')).toBe('true');
- pageData.displayName.clear().then(function() {
- pageData.displayName.sendKeys("Updated display name");
- });
- expect(pageData.updateButton.isEnabled()).toBe(true);
- pageData.updateButton.click();
- expect(pageData.displayName.getText() === "Updated display
name");
- });
-
- it('should assign all eligible servers to the DNS delivery service',
function() {
- console.log('Assigning all eligible servers to ' +
mockVals.dnsXmlId);
- pageData.moreBtn.click();
- pageData.manageServersMenuItem.click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toMatch(commonFunctions.urlPath(browser.baseUrl)+"#!/delivery-services/[0-9]+/servers");
- pageData.moreBtn.click();
- expect(pageData.selectServersMenuItem.isEnabled()).toBe(true);
- pageData.selectServersMenuItem.click();
- browser.wait(ec.presenceOf(pageData.selectAllCB), 5000);
- pageData.selectAllCB.click();
- pageData.selectFormSubmitButton.click();
- browser.sleep(1000);
- expect($('div.alert-success').isDisplayed()).toBe(true);
- });
-
- it('should add a required server capability to the DNS delivery
service', function() {
- console.log('Adding required server capability to ' +
mockVals.dnsXmlId);
- pageData.dsLink.click();
- pageData.moreBtn.click();
- pageData.viewCapabilitiesMenuItem.click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toMatch(commonFunctions.urlPath(browser.baseUrl)+"#!/delivery-services/[0-9]+/required-server-capabilities");
- pageData.addCapabilityBtn.click();
- expect(pageData.selectFormSubmitButton.isEnabled()).toBe(false);
-
commonFunctions.selectDropdownbyNum(pageData.selectFormDropdown, 1);
- expect(pageData.selectFormSubmitButton.isEnabled()).toBe(true);
- pageData.selectFormSubmitButton.click();
- element.all(by.css('tbody tr')).then(function(totalRows) {
- expect(totalRows.length).toBe(1);
- });
- });
-
- it('should delete the DNS delivery service', function() {
- console.log('Deleting ' + mockVals.dnsXmlId);
- pageData.dsLink.click();
- pageData.deleteButton.click();
- pageData.confirmWithNameInput.sendKeys(mockVals.dnsXmlId);
- pageData.deletePermanentlyButton.click();
- expect($('div.alert-success').isDisplayed()).toBe(true);
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/delivery-services");
- });
-
- // HTTP delivery service
-
- it('should click new delivery service and select HTTP category from the
dropdown', function() {
- console.log('Clicked Create New and selecting HTTP');
- pageData.moreBtn.click();
- pageData.createDSMenuItem.click();
- expect(pageData.selectFormSubmitButton.isEnabled()).toBe(false);
-
browser.driver.findElement(by.name('selectFormDropdown')).sendKeys('HTTP');
- expect(pageData.selectFormSubmitButton.isEnabled()).toBe(true);
- pageData.selectFormSubmitButton.click();
- });
-
- it('should populate and submit the delivery service form', function() {
- console.log('Creating a HTTP DS with a topology for ' +
mockVals.httpXmlId);
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/delivery-services/new?type=HTTP");
- expect(pageData.createButton.isEnabled()).toBe(false);
- // set required fields
- // set xml id
- pageData.xmlId.sendKeys(mockVals.httpXmlId);
- // set display name
- pageData.displayName.sendKeys(mockVals.httpXmlId);
- // set active status
- pageData.active.click();
- pageData.active.sendKeys('Active');
- // set content routing type
- pageData.type.click();
- pageData.type.sendKeys(mockVals.dsTypes.http[0]);
- // set tenant
- commonFunctions.selectDropdownbyNum(pageData.tenantId, 1);
- // set cdn
- commonFunctions.selectDropdownbyNum(pageData.cdn, 1);
- // set origin server
- pageData.orgServerFqdn.sendKeys('http://' + mockVals.httpXmlId
+ '.com');
- // set protocol
- commonFunctions.selectDropdownbyNum(pageData.protocol, 1);
- // all required fields have been set, create button should be
enabled
- expect(pageData.createButton.isEnabled()).toBe(true);
- // set topology
- commonFunctions.selectDropdownbyNum(pageData.topology, 1);
- pageData.createButton.click();
- browser.sleep(1000);
- expect($('div.alert-success').isDisplayed()).toBe(true);
- });
-
- it('should update the HTTP delivery service', function() {
- console.log('Updating the HTTP delivery service for ' +
mockVals.httpXmlId);
- browser.setLocation("delivery-services");
- browser.sleep(1000);
- let row = element(by.cssContainingText('.ag-cell',
mockVals.httpXmlId));
- browser.actions().click(row).perform();
- browser.sleep(1000);
- expect(pageData.updateButton.isEnabled()).toBe(false);
- expect(pageData.xmlId.getAttribute('readonly')).toBe('true');
- pageData.displayName.clear().then(function() {
- pageData.displayName.sendKeys("Updated display name");
- });
- expect(pageData.updateButton.isEnabled()).toBe(true);
- pageData.updateButton.click();
- expect(pageData.displayName.getText() === "Updated display
name");
- });
-
- it('should add a required server capability to the HTTP delivery
service', function() {
- console.log('Adding required server capability to ' +
mockVals.httpXmlId);
- pageData.moreBtn.click();
- pageData.viewCapabilitiesMenuItem.click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toMatch(commonFunctions.urlPath(browser.baseUrl)+"#!/delivery-services/[0-9]+/required-server-capabilities");
- pageData.addCapabilityBtn.click();
- expect(pageData.selectFormSubmitButton.isEnabled()).toBe(false);
-
commonFunctions.selectDropdownbyNum(pageData.selectFormDropdown, 1);
- expect(pageData.selectFormSubmitButton.isEnabled()).toBe(true);
- pageData.selectFormSubmitButton.click();
- element.all(by.css('tbody tr')).then(function(totalRows) {
- expect(totalRows.length).toBe(1);
- });
- });
-
- it('should add a required Static DNS entry to the HTTP delivery
service', function() {
- pageData.dsLink.click();
- console.log('Adding Static DNS entry to ' + mockVals.httpXmlId);
- pageData.moreBtn.click();
- pageData.viewStaticCapabilitiesMenuItem.click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toMatch(commonFunctions.urlPath(browser.baseUrl)+"#!/delivery-services/[0-9]+/static-dns-entries");
- pageData.addStaticDNSBtn.click();
- // set host name
- pageData.host.sendKeys(mockVals.staticDNShostName);
- // set type ID to CNAME_RECORD's id
- pageData.staticDNStypeId.click();
- commonFunctions.selectDropdownbyNum(pageData.staticDNStypeId,
3);
- // set ttl
- pageData.ttl.sendKeys(mockVals.staticDNSTTL);
- // set address
- pageData.address.sendKeys(mockVals.staticDNSAddress);
- expect(pageData.createButton.isEnabled()).toBe(true);
- pageData.createButton.click();
- element.all(by.css('tbody tr')).then(function(totalRows) {
- expect(totalRows.length).toBe(1);
- });
- });
-
- it('should navigate back to the HTTP delivery service and view all
servers utilized per the assigned topology', function() {
- console.log('Viewing all servers utilized by ' +
mockVals.httpXmlId);
- pageData.dsLink.click();
- pageData.moreBtn.click();
- pageData.manageServersMenuItem.click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toMatch(commonFunctions.urlPath(browser.baseUrl)+"#!/delivery-services/[0-9]+/servers");
- console.log('The ability to assign ORG servers is enabled for '
+ mockVals.httpXmlId);
- expect(pageData.selectServersMenuItem.isEnabled()).toBe(true);
- expect(pageData.selectServersMenuItem.getText() === 'Assign ORG
Servers');
- });
-
- // Steering delivery service
-
- it('should click new delivery service and select Steering category from
the dropdown', function() {
- console.log('Clicked Create New and selecting Steering');
- browser.setLocation("delivery-services");
- browser.sleep(250);
- pageData.moreBtn.click();
- pageData.createDSMenuItem.click();
- expect(pageData.selectFormSubmitButton.isEnabled()).toBe(false);
-
browser.driver.findElement(by.name('selectFormDropdown')).sendKeys('STEERING');
- expect(pageData.selectFormSubmitButton.isEnabled()).toBe(true);
- pageData.selectFormSubmitButton.click();
- });
-
- it('should populate and submit the delivery service form', function() {
- console.log('Creating a Steering DS for ' + mockVals.dnsXmlId);
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/delivery-services/new?type=STEERING");
- expect(pageData.createButton.isEnabled()).toBe(false);
- // set required fields
- // set xml id
- pageData.xmlId.sendKeys(mockVals.steeringXmlId);
- // set display name
- pageData.displayName.sendKeys(mockVals.steeringXmlId);
- // set active status
- pageData.active.click();
- pageData.active.sendKeys('Active');
- // set content routing type
- pageData.type.click();
- pageData.type.sendKeys(mockVals.dsTypes.steering[0]);
- // set tenant
- commonFunctions.selectDropdownbyNum(pageData.tenantId, 1);
- // set cdn
- commonFunctions.selectDropdownbyNum(pageData.cdn, 1);
- // set protocol
- commonFunctions.selectDropdownbyNum(pageData.protocol, 1);
- // all required fields have been set, create button should be
enabled
- expect(pageData.createButton.isEnabled()).toBe(true);
- pageData.createButton.click();
- browser.sleep(1000);
- expect($('div.alert-success').isDisplayed()).toBe(true);
- });
-
- it('should update the Steering delivery service', function() {
- console.log('Updating the Steering delivery service for ' +
mockVals.steeringXmlId);
- browser.setLocation("delivery-services");
- browser.sleep(1000);
- let row = element(by.cssContainingText('.ag-cell',
mockVals.steeringXmlId));
- browser.actions().click(row).perform();
- browser.sleep(1000);
- expect(pageData.updateButton.isEnabled()).toBe(false);
- expect(pageData.xmlId.getAttribute('readonly')).toBe('true');
- pageData.displayName.clear().then(function() {
- pageData.displayName.sendKeys("Updated display name");
- });
- expect(pageData.updateButton.isEnabled()).toBe(true);
- pageData.updateButton.click();
- expect(pageData.displayName.getText() === "Updated display
name");
- });
-
- it('should navigate back to the STEERING delivery service and delete
it', function() {
- console.log('Deleting ' + mockVals.steeringXmlId);
- pageData.deleteButton.click();
- pageData.confirmWithNameInput.sendKeys(mockVals.steeringXmlId);
- pageData.deletePermanentlyButton.click();
- expect($('div.alert-success').isDisplayed()).toBe(true);
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/delivery-services");
- });
-
-});
diff --git a/traffic_portal/test/e2e_deprecated/deliveryServices/pageData.js
b/traffic_portal/test/e2e_deprecated/deliveryServices/pageData.js
deleted file mode 100644
index b673ce6..0000000
--- a/traffic_portal/test/e2e_deprecated/deliveryServices/pageData.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-module.exports = function(){
- this.moreBtn=element(by.name('moreBtn'));
- this.createDSMenuItem=element(by.name('createDSMenuItem'));
-
this.viewStaticCapabilitiesMenuItem=element(by.css('a[ng-click*=viewStaticDnsEntries]'));
- this.addCapabilityBtn=element(by.name('addCapabilityBtn'));
-
this.manageServersMenuItem=element(by.css('button[ng-click*=viewServers]'));
- this.selectServersMenuItem=element(by.name('selectServersMenuItem'));
- this.selectAllCB=element(by.id('selectAllCB'));
- this.dsLink=element(by.name('dsLink'));
- this.selectFormDropdown=element(by.name('selectFormDropdown'));
- this.selectFormSubmitButton=element(by.buttonText('Submit'));
- this.active=element(by.name('active'));
- this.type=element(by.name('type'));
- this.xmlId=element(by.name('xmlId'));
- this.displayName=element(by.name('displayName'));
- this.tenantId=element(by.name('tenantId'));
- this.cdn=element(by.name('cdn'));
- this.orgServerFqdn=element(by.name('orgServerFqdn'));
- this.protocol=element(by.name('protocol'));
- this.topology=element(by.name('topology'));
- this.longDesc=element(by.name('longDesc'));
- this.remapText=element(by.name('remapText'));
- this.createButton=element(by.buttonText('Create'));
- this.deleteButton=element(by.buttonText('Delete'));
- this.updateButton=element(by.buttonText('Update'));
-
this.searchFilter=element(by.id('deliveryServicesTable_filter')).element(by.css('label
input'));
- this.confirmWithNameInput=element(by.name('confirmWithNameInput'));
- this.deletePermanentlyButton=element(by.buttonText('Delete
Permanently'));
- // delivery service static dns entry fields
-
this.viewCapabilitiesMenuItem=element(by.css('a[ng-click*=viewCapabilities]'));
- this.addStaticDNSBtn=element(by.name('addStaticDNSBtn'));
- this.host=element(by.name('host'));
- this.staticDNStypeId=element(by.name('typeId'));
- this.ttl=element(by.name('ttl'));
- this.address=element(by.name('address'));
-};
\ No newline at end of file
diff --git a/traffic_portal/test/e2e_deprecated/divisions/divisions-spec.js
b/traffic_portal/test/e2e_deprecated/divisions/divisions-spec.js
deleted file mode 100644
index 9f5c35f..0000000
--- a/traffic_portal/test/e2e_deprecated/divisions/divisions-spec.js
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-var pd = require('./pageData.js');
-var cfunc = require('../common/commonFunctions.js');
-
-describe('Traffic Portal Divisions Test Suite', function() {
- const pageData = new pd();
- const commonFunctions = new cfunc();
- const myNewDiv = {
- name: 'division-' + Math.random().toString(36).substring(2, 15)
- };
-
- it('should go to the divisions page', function() {
- console.log("Go to the divisions page");
- browser.setLocation("divisions");
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/divisions");
- });
-
- it('should verify CSV link exists ', function() {
- console.log("Verify CSV button exists");
-
expect(element(by.css('.dt-button.buttons-csv')).isPresent()).toBe(true);
- });
-
- it('should open new division form page', function() {
- console.log("Open new division form page");
-
browser.driver.findElement(by.name('createDivisionButton')).click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/divisions/new");
- });
-
- it('should create a new division', function () {
- console.log("Creating a new division");
- expect(pageData.createButton.isEnabled()).toBe(false);
- pageData.name.sendKeys(myNewDiv.name);
- expect(pageData.createButton.isEnabled()).toBe(true);
- pageData.createButton.click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/divisions");
- });
-
- it('should update a division', function() {
- console.log('Updating the new division: ' + myNewDiv.name);
- pageData.searchFilter.sendKeys(myNewDiv.name);
- element.all(by.repeater('d in
::divisions')).filter(function(row){
- return
row.element(by.name('name')).getText().then(function(val){
- return val === myNewDiv.name;
- });
- }).get(0).click();
- pageData.name.clear();
- pageData.name.sendKeys(myNewDiv.name + ' updated');
- pageData.updateButton.click();
- expect(pageData.name.getText() === myNewDiv.name + ' updated');
- });
-
-});
diff --git a/traffic_portal/test/e2e_deprecated/divisions/pageData.js
b/traffic_portal/test/e2e_deprecated/divisions/pageData.js
deleted file mode 100644
index d8b6b3e..0000000
--- a/traffic_portal/test/e2e_deprecated/divisions/pageData.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-module.exports = function(){
- this.name=element(by.name('name'));
- this.createButton=element(by.buttonText('Create'));
- this.deleteButton=element(by.buttonText('Delete'));
- this.updateButton=element(by.buttonText('Update'));
-
this.searchFilter=element(by.id('divisionsTable_filter')).element(by.css('label
input'));
- this.confirmWithNameInput=element(by.name('confirmWithNameInput'));
- this.deletePermanentlyButton=element(by.buttonText('Delete
Permanently'));
-};
diff --git a/traffic_portal/test/e2e_deprecated/jobs/jobs-spec.js
b/traffic_portal/test/e2e_deprecated/jobs/jobs-spec.js
deleted file mode 100644
index ca594ab..0000000
--- a/traffic_portal/test/e2e_deprecated/jobs/jobs-spec.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-var pd = require('./pageData.js');
-var cfunc = require('../common/commonFunctions.js');
-
-describe('Traffic Portal Jobs Test Suite', function() {
- const pageData = new pd();
- const commonFunctions = new cfunc();
- const newJob = {
- regex: '/foo.png',
- ttl: 24
- };
-
- it('should go to the jobs page', function() {
- console.log("Go to the jobs page");
- browser.setLocation("jobs");
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/jobs");
- });
-
- it('should open new job form page', function() {
- console.log("Open new job form page");
- pageData.moreBtn.click();
- pageData.createJobMenuItem.click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/jobs/new");
- });
-
- it('should build a new job', function () {
- console.log("Building a new job");
- expect(pageData.createButton.isEnabled()).toBe(false);
- commonFunctions.selectDropdownbyNum(pageData.deliveryservice,
1);
- pageData.regex.sendKeys(newJob.regex);
- pageData.ttl.sendKeys(newJob.ttl);
- expect(pageData.createButton.isEnabled()).toBe(true);
- pageData.createButton.click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/jobs");
- });
-
-});
diff --git a/traffic_portal/test/e2e_deprecated/jobs/pageData.js
b/traffic_portal/test/e2e_deprecated/jobs/pageData.js
deleted file mode 100644
index 422ee60..0000000
--- a/traffic_portal/test/e2e_deprecated/jobs/pageData.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-module.exports = function(){
- this.moreBtn=element(by.name('moreBtn'));
- this.createJobMenuItem=element(by.name('createJobMenuItem'));
- this.regex=element(by.name('regex'));
- this.ttl=element(by.name('ttl'));
- this.deliveryservice=element(by.name('deliveryservice'));
- this.createButton=element(by.buttonText('Create'));
-};
diff --git a/traffic_portal/test/e2e_deprecated/login/login-spec.js
b/traffic_portal/test/e2e_deprecated/login/login-spec.js
deleted file mode 100644
index 6551564..0000000
--- a/traffic_portal/test/e2e_deprecated/login/login-spec.js
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-var cfunc = require('../common/commonFunctions.js');
-
-describe('Traffic Portal Login Test Suite', function() {
- const commonFunctions = new cfunc();
-
- beforeEach(function() {
- browser.get(browser.baseUrl + '/#!/cdns');
- browser.wait(function() {
- return element(by.name('loginUsername')).isPresent();
- }, 5000);
- });
-
- it('should not show environment banner in prod mode', function() {
- console.log('Verifying environment banner does not have the
prod class');
-
expect(element(by.css('.enviro-banner.prod')).isPresent()).toBe(false);
- });
-
- it('should fail login to Traffic Portal with bad user', function() {
- console.log('Negative login test');
-
browser.driver.findElement(by.name('loginUsername')).sendKeys('badUser');
-
browser.driver.findElement(by.name('loginPass')).sendKeys('badPassword');
- browser.driver.findElement(by.name('loginSubmit')).click();
- browser.sleep(250);
-
expect(browser.driver.findElement(by.css('div.ng-binding')).getText()).toEqual('Invalid
username or password.');
- });
-
- it('should successfully login to Traffic Portal', function() {
- console.log('Logging in to Traffic Portal "' + browser.baseUrl
+ '" with user "' + browser.params.adminUser + '"');
-
browser.driver.findElement(by.name('loginUsername')).sendKeys(browser.params.adminUser);
-
browser.driver.findElement(by.name('loginPass')).sendKeys(browser.params.adminPassword);
- browser.driver.findElement(by.name('loginSubmit')).click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/cdns");
- });
-});
diff --git a/traffic_portal/test/e2e_deprecated/parameters/pageData.js
b/traffic_portal/test/e2e_deprecated/parameters/pageData.js
deleted file mode 100644
index 5892362..0000000
--- a/traffic_portal/test/e2e_deprecated/parameters/pageData.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-module.exports = function(){
- this.createParameterButton=element(by.css('[title="Create Parameter"]'));
- this.name=element(by.name('name'));
- this.configFile=element(by.name('configFile'));
- this.secure=element(by.name('secure'));
- this.value=element(by.name('value'));
- this.createButton=element(by.buttonText('Create'));
- this.deleteButton=element(by.buttonText('Delete'));
- this.updateButton=element(by.buttonText('Update'));
-
this.searchFilter=element(by.id('parametersTable_filter')).element(by.css('label
input'));
- this.confirmWithNameInput=element(by.name('confirmWithNameInput'));
- this.deletePermanentlyButton=element(by.buttonText('Delete
Permanently'));
-};
diff --git a/traffic_portal/test/e2e_deprecated/parameters/parameters-spec.js
b/traffic_portal/test/e2e_deprecated/parameters/parameters-spec.js
deleted file mode 100644
index 2387157..0000000
--- a/traffic_portal/test/e2e_deprecated/parameters/parameters-spec.js
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-var pd = require('./pageData.js');
-var cfunc = require('../common/commonFunctions.js');
-
-describe('Traffic Portal Parameters Test Suite', function() {
- const pageData = new pd();
- const commonFunctions = new cfunc();
- const myNewParameter = {
- name: 'parameter-' +
commonFunctions.shuffle('abcdefghijklmonpqrstuvwxyz0123456789'),
- configFile: 'config-' +
commonFunctions.shuffle('abcdefghijklmonpqrstuvwxyz0123456789')
- };
-
- it('should go to the parameters page', function() {
- console.log("Go to the parameters page");
- browser.setLocation("parameters");
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/parameters");
- });
-
- it('should verify CSV link exists ', function() {
- console.log("Verify CSV button exists");
-
expect(element(by.css('.dt-button.buttons-csv')).isPresent()).toBe(true);
- });
-
- it('should open new parameter form page', function() {
- console.log("Open new parameter form page");
- pageData.createParameterButton.click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/parameters/new");
- });
-
- it('should fill out form, create button is enabled and submit',
function () {
- console.log("Filling out form, check create button is enabled
and submit");
- expect(pageData.createButton.isEnabled()).toBe(false);
- pageData.name.sendKeys(myNewParameter.name);
- pageData.configFile.sendKeys(myNewParameter.configFile);
- commonFunctions.selectDropdownbyNum(pageData.secure, 1);
- pageData.value.sendKeys(myNewParameter.name);
- expect(pageData.createButton.isEnabled()).toBe(true);
- pageData.createButton.click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toMatch(commonFunctions.urlPath(browser.baseUrl)+"#!/parameters/[0-9]+/profiles");
- });
-
- it('should go back to the parameters page', function() {
- console.log("Go to the parameters page");
- browser.setLocation("parameters");
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/parameters");
- });
-
- it('should toggle the visibility of the first table column ', function
() {
- browser.setLocation("parameters");
- browser.driver.findElement(by.id('toggleColumns')).click();
- let first = element.all(by.css('input[type=checkbox]')).first();
- expect(first.isSelected()).toBe(true);
- first.click();
- expect(first.isSelected()).toBe(false);
- let tableColumns = element.all(by.css('#parametersTable
tr:first-child th'));
- expect(tableColumns.count()).toBe(4);
- });
-
-});
\ No newline at end of file
diff --git a/traffic_portal/test/e2e_deprecated/physLocations/pageData.js
b/traffic_portal/test/e2e_deprecated/physLocations/pageData.js
deleted file mode 100644
index f893b21..0000000
--- a/traffic_portal/test/e2e_deprecated/physLocations/pageData.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-module.exports = function(){
- this.name=element(by.name('name'));
- this.shortName=element(by.name('shortName'));
- this.address=element(by.name('address'));
- this.city=element(by.name('city'));
- this.state=element(by.name('state'));
- this.zip=element(by.name('zip'));
- this.region=element(by.name('region'));
- this.createButton=element(by.buttonText('Create'));
- this.deleteButton=element(by.buttonText('Delete'));
- this.updateButton=element(by.buttonText('Update'));
-
this.searchFilter=element(by.id('physLocationsTable_filter')).element(by.css('label
input'));
- this.confirmWithNameInput=element(by.name('confirmWithNameInput'));
- this.deletePermanentlyButton=element(by.buttonText('Delete
Permanently'));
-};
diff --git
a/traffic_portal/test/e2e_deprecated/physLocations/phys-locations-spec.js
b/traffic_portal/test/e2e_deprecated/physLocations/phys-locations-spec.js
deleted file mode 100644
index 83ee81a..0000000
--- a/traffic_portal/test/e2e_deprecated/physLocations/phys-locations-spec.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-var pd = require('./pageData.js');
-var cfunc = require('../common/commonFunctions.js');
-
-describe('Traffic Portal Phys Locations Test Suite', function() {
- const pageData = new pd();
- const commonFunctions = new cfunc();
- const myNewPhysLoc = {
- name: 'phys-loc-' +
commonFunctions.shuffle('abcdefghijklmonpqrstuvwxyz0123456789'),
- address: '1200 sycamore lane',
- city: 'Pottersville',
- state: 'AK',
- zip: '12345'
- };
-
- it('should go to the phys locations page', function() {
- console.log("Go to the phys locations page");
- browser.setLocation("phys-locations");
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/phys-locations");
- });
-
- it('should verify CSV link exists ', function() {
- console.log("Verify CSV button exists");
-
expect(element(by.css('.dt-button.buttons-csv')).isPresent()).toBe(true);
- });
-
- it('should open new phys locations form page', function() {
- console.log("Open new phys location form page");
-
browser.driver.findElement(by.name('createPhysLocationButton')).click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/phys-locations/new");
- });
-
- it('should fill out form, create button is enabled and submit',
function () {
- console.log("Filling out form, check create button is enabled
and submit");
- expect(pageData.createButton.isEnabled()).toBe(false);
- pageData.name.sendKeys(myNewPhysLoc.name);
- pageData.shortName.sendKeys(myNewPhysLoc.name);
- pageData.address.sendKeys(myNewPhysLoc.address);
- pageData.city.sendKeys(myNewPhysLoc.city);
- pageData.state.sendKeys(myNewPhysLoc.state);
- pageData.zip.sendKeys(myNewPhysLoc.zip);
- commonFunctions.selectDropdownbyNum(pageData.region, 1);
- expect(pageData.createButton.isEnabled()).toBe(true);
- pageData.createButton.click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/phys-locations");
- });
-
-});
diff --git a/traffic_portal/test/e2e_deprecated/profiles/pageData.js
b/traffic_portal/test/e2e_deprecated/profiles/pageData.js
deleted file mode 100644
index 924c7f6..0000000
--- a/traffic_portal/test/e2e_deprecated/profiles/pageData.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-module.exports = function(){
- this.moreBtn=element(by.name('moreBtn'));
-
this.compareProfilesMenuItem=element(by.css('a[ng-click*=compareProfiles]'));
- this.compareDropdown1=element(by.name('compareDropdown1'));
- this.compareDropdown2=element(by.name('compareDropdown2'));
- this.compareSubmit=element(by.name('compareSubmit'));
- this.description=element(by.id('description'));
- this.createProfileButton=element(by.name('createProfileButton'));
- this.name=element(by.name('name'));
- this.cdn=element(by.name('cdn'));
- this.type=element(by.name('type'));
- this.routingDisabled=element(by.name('routingDisabled'));
- this.description=element(by.id('description'));
- this.createButton=element(by.buttonText('Create'));
- this.deleteButton=element(by.buttonText('Delete'));
- this.updateButton=element(by.buttonText('Update'));
-
this.searchFilter=element(by.id('profilesTable_filter')).element(by.css('label
input'));
- this.confirmWithNameInput=element(by.name('confirmWithNameInput'));
- this.deletePermanentlyButton=element(by.buttonText('Delete
Permanently'));
-};
diff --git a/traffic_portal/test/e2e_deprecated/profiles/profiles-spec.js
b/traffic_portal/test/e2e_deprecated/profiles/profiles-spec.js
deleted file mode 100644
index 86205c4..0000000
--- a/traffic_portal/test/e2e_deprecated/profiles/profiles-spec.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-var pd = require('./pageData.js');
-var cfunc = require('../common/commonFunctions.js');
-
-describe('Traffic Portal Profiles Test Suite', function() {
- const pageData = new pd();
- const commonFunctions = new cfunc();
- const myNewProfile = {
- name: 'profile-' +
commonFunctions.shuffle('abcdefghijklmonpqrstuvwxyz0123456789'),
- };
-
- it('should go to the profiles page', function() {
- console.log("Go to the profiles page");
- browser.setLocation("profiles");
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/profiles");
- });
-
- it('should verify CSV link exists ', function() {
- console.log("Verify CSV button exists");
-
expect(element(by.css('.dt-button.buttons-csv')).isPresent()).toBe(true);
- });
-
- it('should compare profiles', function() {
- console.log("Comparing profiles");
- pageData.moreBtn.click();
- pageData.compareProfilesMenuItem.click();
- expect(pageData.compareSubmit.isEnabled()).toBe(false);
- commonFunctions.selectDropdownbyNum(pageData.compareDropdown1,
1);
- commonFunctions.selectDropdownbyNum(pageData.compareDropdown2,
2);
- expect(pageData.compareSubmit.isEnabled()).toBe(true);
- pageData.compareSubmit.click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toMatch(commonFunctions.urlPath(browser.baseUrl)+"#!/profiles/[0-9]+/[0-9]+/compare/diff");
- });
-
- it('should open new profile form page', function() {
- console.log("Open new profile form page");
- browser.setLocation("profiles");
- pageData.createProfileButton.click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/profiles/new");
- });
-
- it('should fill out form, create button is enabled and submit',
function () {
- console.log("Filling out form, check create button is enabled
and submit");
- expect(pageData.createButton.isEnabled()).toBe(false);
- pageData.name.sendKeys(myNewProfile.name);
- commonFunctions.selectDropdownbyNum(pageData.cdn, 2); // the
ALL CDN is first so let's pick a real CDN
- commonFunctions.selectDropdownbyNum(pageData.type, 1);
- pageData.routingDisabled.click();
- pageData.routingDisabled.sendKeys('false');
- pageData.description.sendKeys(myNewProfile.name);
- expect(pageData.createButton.isEnabled()).toBe(true);
- pageData.createButton.click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toMatch(commonFunctions.urlPath(browser.baseUrl)+"#!/profiles/[0-9]+/parameters");
- });
-
- it('should go back to the profiles page', function() {
- console.log("Go to the profiles page");
- browser.setLocation("profiles");
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/profiles");
- });
-
- it('should toggle the visibility of the first table column ', function
() {
- browser.driver.findElement(by.id('toggleColumns')).click();
- let first = element.all(by.css('input[type=checkbox]')).first();
- expect(first.isSelected()).toBe(true);
- first.click();
- expect(first.isSelected()).toBe(false);
- let tableColumns = element.all(by.css('#profilesTable
tr:first-child th'));
- expect(tableColumns.count()).toBe(4);
- });
-
-
-});
diff --git a/traffic_portal/test/e2e_deprecated/regions/pageData.js
b/traffic_portal/test/e2e_deprecated/regions/pageData.js
deleted file mode 100644
index 81a60fb..0000000
--- a/traffic_portal/test/e2e_deprecated/regions/pageData.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-module.exports = function(){
- this.name=element(by.name('name'));
- this.division=element(by.name('division'));
- this.createButton=element(by.buttonText('Create'));
- this.deleteButton=element(by.buttonText('Delete'));
- this.updateButton=element(by.buttonText('Update'));
-
this.searchFilter=element(by.id('regionsTable_filter')).element(by.css('label
input'));
- this.confirmWithNameInput=element(by.name('confirmWithNameInput'));
- this.deletePermanentlyButton=element(by.buttonText('Delete
Permanently'));
-};
diff --git a/traffic_portal/test/e2e_deprecated/regions/regions-spec.js
b/traffic_portal/test/e2e_deprecated/regions/regions-spec.js
deleted file mode 100644
index 9fdcf8e..0000000
--- a/traffic_portal/test/e2e_deprecated/regions/regions-spec.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-var pd = require('./pageData.js');
-var cfunc = require('../common/commonFunctions.js');
-
-describe('Traffic Portal Regions Test Suite', function() {
- const pageData = new pd();
- const commonFunctions = new cfunc();
- const myNewRegion = {
- name: 'region-' +
commonFunctions.shuffle('abcdefghijklmonpqrstuvwxyz0123456789'),
- };
-
- it('should go to the regions page', function() {
- console.log("Go to the regions page");
- browser.setLocation("regions");
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/regions");
- });
-
- it('should verify CSV link exists ', function() {
- console.log("Verify CSV button exists");
-
expect(element(by.css('.dt-button.buttons-csv')).isPresent()).toBe(true);
- });
-
- it('should open new region form page', function() {
- console.log("Open new region form page");
-
browser.driver.findElement(by.name('createRegionButton')).click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/regions/new");
- });
-
- it('should fill out form, create button is enabled and submit',
function () {
- console.log("Filling out form, check create button is enabled
and submit");
- expect(pageData.createButton.isEnabled()).toBe(false);
- pageData.name.sendKeys(myNewRegion.name);
- commonFunctions.selectDropdownbyNum(pageData.division, 1);
- expect(pageData.createButton.isEnabled()).toBe(true);
- pageData.createButton.click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/regions");
- });
-
-});
diff --git a/traffic_portal/test/e2e_deprecated/serverCapabilities/pageData.js
b/traffic_portal/test/e2e_deprecated/serverCapabilities/pageData.js
deleted file mode 100644
index 3e69548..0000000
--- a/traffic_portal/test/e2e_deprecated/serverCapabilities/pageData.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-module.exports = function(){
- this.name=element(by.name('name'));
- this.createButton=element(by.buttonText('Create'));
- this.updateButton=element(by.buttonText('Update'));
- this.deleteButton=element(by.buttonText('Delete'));
-
this.searchFilter=element(by.id('serverCapabilitiesTable_filter')).element(by.css('label
input'));
- this.confirmWithNameInput=element(by.name('confirmWithNameInput'));
- this.deletePermanentlyButton=element(by.buttonText('Delete
Permanently'));
-};
diff --git
a/traffic_portal/test/e2e_deprecated/serverCapabilities/server-capabilities-spec.js
b/traffic_portal/test/e2e_deprecated/serverCapabilities/server-capabilities-spec.js
deleted file mode 100644
index 1f11a5b..0000000
---
a/traffic_portal/test/e2e_deprecated/serverCapabilities/server-capabilities-spec.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-var pd = require('./pageData.js');
-var cfunc = require('../common/commonFunctions.js');
-
-describe('Traffic Portal Server Capabilities Test Suite', function() {
- const pageData = new pd();
- const commonFunctions = new cfunc();
- const myNewServerCap = {
- name: 'server-cap-' + Math.random().toString(36).substring(2,
15)
- };
-
- it('should go to the server capabilities page', function() {
- console.log("Go to the server capabilities page");
- browser.setLocation("server-capabilities");
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/server-capabilities");
- });
-
- it('should verify CSV link exists ', function() {
- console.log("Verify CSV button exists");
-
expect(element(by.css('.dt-button.buttons-csv')).isPresent()).toBe(true);
- });
-
- it('should open new server capability form page', function() {
- console.log("Open new server capability form page");
-
browser.driver.findElement(by.name('createServerCapabilityButton')).click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/server-capabilities/new");
- });
-
- it('should create a new server capability', function () {
- console.log("Creating a new server capability");
- expect(pageData.createButton.isEnabled()).toBe(false);
- pageData.name.sendKeys(myNewServerCap.name);
- expect(pageData.createButton.isEnabled()).toBe(true);
- pageData.createButton.click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/server-capabilities");
- });
-
- it('should edit an existing server capability', function() {
- console.log('Editing an existing server capability: ' +
myNewServerCap.name);
- pageData.searchFilter.sendKeys(myNewServerCap.name);
- element.all(by.repeater('sc in
::serverCapabilities')).filter(function(row){
- return
row.element(by.name('name')).getText().then(function(val){
- return val === myNewServerCap.name;
- });
- }).get(0).click();
- expect(pageData.name.getText() === myNewServerCap.name);
- expect(pageData.updateButton.isEnabled()).toBe(false);
- pageData.name.sendKeys("-updated");
- expect(pageData.updateButton.isEnabled()).toBe(true);
- expect(pageData.name.getText() ===
myNewServerCap.name+"-updated");
- });
-
-});
diff --git a/traffic_portal/test/e2e_deprecated/servers/pageData.js
b/traffic_portal/test/e2e_deprecated/servers/pageData.js
deleted file mode 100644
index 8a4d045..0000000
--- a/traffic_portal/test/e2e_deprecated/servers/pageData.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-module.exports = function(){
- this.moreBtn=element(by.name('moreBtn'));
- this.createServerMenuItem=element(by.name('createServerMenuItem'));
-
this.viewCapabilitiesMenuItem=element(by.css('a[ng-click*=viewCapabilities]'));
- this.addCapabilityBtn=element(by.name('addCapabilityBtn'));
- this.selectFormDropdown=element(by.name('selectFormDropdown'));
-
this.viewDeliveryServicesMenuItem=element(by.css('a[ng-click*=viewDeliveryServices]'));
- this.status=element(by.name('status'));
- this.hostName=element(by.name('hostName'));
- this.domainName=element(by.name('domainName'));
- this.cdn=element(by.name('cdn'));
- this.cachegroup=element(by.name('cachegroup'));
- this.type=element(by.name('type'));
- this.profile=element(by.name('profile'));
- this.physLocation=element(by.name('physLocation'));
- this.addInterfaceBtn=element(by.name('addInterfaceBtn'));
- this.addIPBtn=element(by.name('addIPBtn'));
- this.interfaceName=element(by.css('.interface-name-input'));
- this.ipAddress=element(by.css('.ip-input'));
- this.ipIsService=element(by.css('.service-addr-cb'));
- this.createButton=element(by.buttonText('Create'));
- this.deleteButton=element(by.buttonText('Delete'));
- this.updateButton=element(by.buttonText('Update'));
- this.submitButton=element(by.buttonText('Submit'));
- this.confirmWithNameInput=element(by.name('confirmWithNameInput'));
- this.deletePermanentlyButton=element(by.buttonText('Delete
Permanently'));
-};
\ No newline at end of file
diff --git a/traffic_portal/test/e2e_deprecated/servers/servers-spec.js
b/traffic_portal/test/e2e_deprecated/servers/servers-spec.js
deleted file mode 100644
index f9c4ed2..0000000
--- a/traffic_portal/test/e2e_deprecated/servers/servers-spec.js
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-var pd = require('./pageData.js');
-var cfunc = require('../common/commonFunctions.js');
-
-describe('Traffic Portal Servers Test Suite', function() {
-
- const pageData = new pd();
- const commonFunctions = new cfunc();
- const mockVals = {
- status: "ONLINE",
- hostName: "testHost-" +
commonFunctions.shuffle('abcdefghijklmonpqrstuvwxyz0123456789'),
- domainName: "servertest.com",
- interfaceName: "testInterfaceName",
- ipAddress: "10.42.80.118",
- interfaceMtu: "9000",
- routerHostName: "testInterfaceRouterHostName",
- routerPortName: "testInterfaceRouterPort",
- };
-
- it('should go to the Servers page', function() {
- console.log('Loading Configure/Servers');
- browser.setLocation("servers");
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/servers");
- });
-
- it('should open new Servers form page', function() {
- console.log('Clicking on Create new server ' +
mockVals.hostName);
- pageData.moreBtn.click();
- pageData.createServerMenuItem.click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/servers/new");
- });
-
- it('should fill out form, create button is enabled and submit',
function () {
- console.log('Filling out Server form');
- expect(pageData.createButton.isEnabled()).toBe(false);
- pageData.status.click();
- pageData.status.sendKeys(mockVals.status);
- pageData.hostName.sendKeys(mockVals.hostName);
- pageData.domainName.sendKeys(mockVals.domainName);
- commonFunctions.selectDropdownbyNum(pageData.cdn, 2); // the
ALL CDN is first so let's pick a real CDN
- // Assign this server to a created cache-group, needed for
Topologies tests
-
pageData.cachegroup.all(by.tagName("option")).then(function(options) {
- options[options.length-1].click();
- });
- element(by.css("#type [label='EDGE']")).click();
- commonFunctions.selectDropdownbyNum(pageData.profile, 1);
- commonFunctions.selectDropdownbyNum(pageData.physLocation, 1);
- pageData.interfaceName.sendKeys(mockVals.interfaceName);
- pageData.ipAddress.sendKeys(mockVals.ipAddress);
- expect(pageData.createButton.isEnabled()).toBe(true);
- pageData.createButton.click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/servers");
- });
-
- it('should toggle the visibility of the first table column ',
function() {
- console.log("Toggling visiblity of column");
- browser.driver.findElement(by.id('toggleColumns')).click();
- let first = element.all(by.css('input[type=checkbox]')).first();
- expect(first.isSelected()).toBe(true);
- first.click();
- expect(first.isSelected()).toBe(false);
- let tableColumns = element.all(by.css('.ag-header-cell'));
- expect(tableColumns.count()).toBe(9);
- });
-
- it('should clear column filter when column is hidden', function() {
- console.log("Clear filters when column is hidden");
- // Confirm we have rows
- let rows = element.all(by.css("div.ag-row"));
- expect(rows.count()).not.toBe(0);
-
- // Filter one of our columns
- let firstHeaderCell =
element.all(by.css('.ag-header-cell')).first();
-
firstHeaderCell.all(by.css('span.ag-header-cell-menu-button')).first().click();
- let filterContainer = element(by.css("div.ag-filter"));
- let filterCell =
filterContainer.all(by.css('.ag-input-field-input')).first();
- filterCell.sendKeys("nothingshouldmatchthis",
protractor.Key.ENTER);
-
- // Wait for ag-grid to process changes
- browser.sleep(1000);
- rows = element.all(by.css("div.ag-row"));
- expect(rows.count()).toBe(0);
-
- // Hide filtered column
- let columnToggle = element(by.id('toggleColumns')).click();
-
columnToggle.all(by.css('input[type=checkbox]:checked')).first().click();
-
- // Wait for ag-grid again
- rows = element.all(by.css("div.ag-row"));
- expect(rows.count()).not.toBe(0);
- });
-
- it('should verify the new Server and then update Server', function() {
- console.log('Verifying new server added and updating ' +
mockVals.hostName);
- browser.sleep(1000);
- let row = element(by.cssContainingText('.ag-cell',
mockVals.hostName));
- browser.actions().click(row).perform();
- browser.sleep(1000);
- pageData.domainName.clear();
- pageData.domainName.sendKeys('testupdated.com');
- pageData.type.click();
- pageData.updateButton.click();
- expect(pageData.domainName.getText() === 'testupdated.com');
- });
-
- it('should add a server capability to the server', function() {
- console.log('Adding new server capability to ' +
mockVals.hostName);
- pageData.moreBtn.click();
- pageData.viewCapabilitiesMenuItem.click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toMatch(commonFunctions.urlPath(browser.baseUrl)+"#!/servers/[0-9]+/capabilities");
- pageData.addCapabilityBtn.click();
- expect(pageData.submitButton.isEnabled()).toBe(false);
-
commonFunctions.selectDropdownbyNum(pageData.selectFormDropdown, 1);
- expect(pageData.submitButton.isEnabled()).toBe(true);
- pageData.submitButton.click().then(function() {
- element.all(by.css('tbody
tr')).then(function(totalRows) {
- expect(totalRows.length).toBe(1);
- });
- });
- });
-
- it('should navigate back to the new server and view the delivery
services assigned to the server', function() {
- console.log('Managing the delivery services of ' +
mockVals.hostName);
- browser.navigate().back();
- pageData.moreBtn.click();
- pageData.viewDeliveryServicesMenuItem.click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toMatch(commonFunctions.urlPath(browser.baseUrl)+"#!/servers/[0-9]+/delivery-services");
- });
-});
diff --git a/traffic_portal/test/e2e_deprecated/tenants/pageData.js
b/traffic_portal/test/e2e_deprecated/tenants/pageData.js
deleted file mode 100644
index fa2c03c..0000000
--- a/traffic_portal/test/e2e_deprecated/tenants/pageData.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-module.exports = function(){
- this.name=element(by.name('name'));
- this.active=element(by.name('active'));
- this.parent=element(by.name('parentId'));
- this.createButton=element(by.buttonText('Create'));
-};
diff --git a/traffic_portal/test/e2e_deprecated/tenants/tenants-spec.js
b/traffic_portal/test/e2e_deprecated/tenants/tenants-spec.js
deleted file mode 100644
index e0b9ea3..0000000
--- a/traffic_portal/test/e2e_deprecated/tenants/tenants-spec.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-var pd = require('./pageData.js');
-var cfunc = require('../common/commonFunctions.js');
-
-describe('Traffic Portal Tenants Test Suite', function() {
- const pageData = new pd();
- const commonFunctions = new cfunc();
- const myNewTenant = {
- name: 'tenant-' +
commonFunctions.shuffle('abcdefghijklmonpqrstuvwxyz0123456789')
- };
-
- it('should go to the tenants page', function() {
- console.log("Go to the tenants page");
- browser.setLocation("tenants");
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/tenants");
- });
-
- it('should open new tenant form page', function() {
- console.log("Open new tenant form page");
-
browser.driver.findElement(by.name('createTenantButton')).click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/tenants/new");
- });
-
- it('should fill out form, create button is enabled and submit',
function () {
- console.log("Filling out form, check create button is enabled
and submit");
- expect(pageData.createButton.isEnabled()).toBe(false);
- pageData.name.sendKeys(myNewTenant.name);
- commonFunctions.selectDropdownbyNum(pageData.active, 1);
- commonFunctions.selectDropdownbyNum(pageData.parent, 1);
- expect(pageData.createButton.isEnabled()).toBe(true);
- pageData.createButton.click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/tenants");
- });
-
-
-
-});
diff --git a/traffic_portal/test/e2e_deprecated/topologies/pageData.js
b/traffic_portal/test/e2e_deprecated/topologies/pageData.js
deleted file mode 100644
index 385bf57..0000000
--- a/traffic_portal/test/e2e_deprecated/topologies/pageData.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-module.exports = function(){
- this.moreBtn=element(by.name('moreBtn'));
- this.topLink=element(by.name('topLink'));
-
this.searchFilter=element(by.id('topologiesTable_filter')).element(by.css('label
input'));
- this.name=element(by.name('name'));
- this.description=element(by.id('description'));
- this.addChildCacheGroupBtn=element(by.css('.add-child-cg-btn'));
- this.selectFormSubmitButton=element(by.buttonText('Submit'));
- this.selectAllCB=element(by.id('selectAllCB'));
- this.cloneButton=element(by.buttonText('Clone'));
- this.updateButton=element(by.buttonText('Update'));
- this.createButton=element(by.buttonText('Create'));
- this.cloneToplogyMenuItem=element(by.name('cloneToplogyMenuItem'));
-
this.viewDeliveryServicesMenuItem=element(by.name('viewDeliveryServicesMenuItem'));
-
this.viewCacheGroupsMenuItem=element(by.name('viewCacheGroupsMenuItem'));
- this.viewServersMenuItem=element(by.name('viewServersMenuItem'));
-};
diff --git a/traffic_portal/test/e2e_deprecated/topologies/topologies-spec.js
b/traffic_portal/test/e2e_deprecated/topologies/topologies-spec.js
deleted file mode 100644
index 1fb0bf6..0000000
--- a/traffic_portal/test/e2e_deprecated/topologies/topologies-spec.js
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-var pd = require('./pageData.js');
-var cfunc = require('../common/commonFunctions.js');
-
-describe('Traffic Portal Topologies Test Suite', function() {
- const pageData = new pd();
- const commonFunctions = new cfunc();
- const ec = protractor.ExpectedConditions;
- const myNewTopology = {
- name: 'topology-' +
commonFunctions.shuffle('abcdefghijklmonpqrstuvwxyz0123456789'),
- desc: 'topology-' +
commonFunctions.shuffle('abcdefghijklmonpqrstuvwxyz0123456789')
- };
-
- it('should go to the topologies page', function() {
- console.log("Go to the topologies page");
- browser.setLocation("topologies");
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/topologies");
- });
-
- it('should verify CSV link exists ', function() {
- console.log("Verify CSV button exists");
-
expect(element(by.css('.dt-button.buttons-csv')).isPresent()).toBe(true);
- });
-
- it('should open new topology form page', function() {
- console.log("Open new topology form page");
-
browser.driver.findElement(by.name('createTopologyBtn')).click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/topologies/new");
- });
-
- it('should build a new topology', function () {
- console.log("Building a new topology");
- pageData.addChildCacheGroupBtn.click();
- expect(pageData.selectFormSubmitButton.isEnabled()).toBe(false);
-
browser.driver.findElement(by.name('selectFormDropdown')).sendKeys('EDGE_LOC');
- expect(pageData.selectFormSubmitButton.isEnabled()).toBe(true);
- pageData.selectFormSubmitButton.click();
- browser.wait(ec.presenceOf(pageData.selectAllCB), 5000);
- pageData.selectAllCB.click();
- pageData.selectFormSubmitButton.click();
- });
-
- it('should fill out the rest of the topology form, create button is
enabled and submit', function () {
- console.log("Filling out topology form, check create button is
enabled and submit");
- expect(pageData.createButton.isEnabled()).toBe(false);
- pageData.name.sendKeys(myNewTopology.name);
- pageData.description.sendKeys(myNewTopology.desc);
- expect(pageData.createButton.isEnabled()).toBe(true);
- pageData.createButton.click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/topologies");
- });
-
- it('should update the topology', function() {
- console.log('Updating the topology: ' + myNewTopology.name);
- pageData.searchFilter.sendKeys(myNewTopology.name);
- element.all(by.repeater('t in
::topologies')).filter(function(row){
- return
row.element(by.name('name')).getText().then(function(val){
- return val === myNewTopology.name;
- });
- }).get(0).click();
- expect(pageData.updateButton.isEnabled()).toBe(false);
- pageData.description.clear().then(function() {
- pageData.description.sendKeys("Updated description");
- });
- expect(pageData.updateButton.isEnabled()).toBe(true);
- pageData.updateButton.click();
- expect(pageData.description.getText() === "Updated
description");
- });
-
- it('should view all delivery services that utilize the topology',
function() {
- console.log('Viewing all delivery services that utilize: ' +
myNewTopology.name);
- pageData.moreBtn.click();
- pageData.viewDeliveryServicesMenuItem.click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toMatch(commonFunctions.urlPath(browser.baseUrl)+"#!/topologies/delivery-services");
- });
-
- it('should navigate back to the topology and view all cache groups
utilized by the topology', function() {
- console.log('Viewing all cache groups utilized by ' +
myNewTopology.name);
- pageData.topLink.click();
- pageData.moreBtn.click();
- pageData.viewCacheGroupsMenuItem.click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toMatch(commonFunctions.urlPath(browser.baseUrl)+"#!/topologies/cache-groups");
- });
-
- it('should navigate back to the topology and view all servers utilized
by the topology', function() {
- console.log('Viewing all servers utilized by ' +
myNewTopology.name);
- pageData.topLink.click();
- pageData.moreBtn.click();
- pageData.viewServersMenuItem.click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toMatch(commonFunctions.urlPath(browser.baseUrl)+"#!/topologies/servers");
- });
-
- it('should navigate back to the topology and clone the topology',
function() {
- console.log('Cloning topology: ' + myNewTopology.name);
- pageData.topLink.click();
- pageData.moreBtn.click();
- pageData.cloneToplogyMenuItem.click();
- expect(pageData.cloneButton.isEnabled()).toBe(false);
- pageData.name.sendKeys(myNewTopology.name + '-clone');
- expect(pageData.cloneButton.isEnabled()).toBe(true);
- pageData.cloneButton.click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/topologies");
- });
-});
diff --git a/traffic_portal/test/e2e_deprecated/types/types-spec.js
b/traffic_portal/test/e2e_deprecated/types/types-spec.js
deleted file mode 100644
index c66b476..0000000
--- a/traffic_portal/test/e2e_deprecated/types/types-spec.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-var cfunc = require('../common/commonFunctions.js');
-
-describe('Traffic Portal Types Test Suite', function() {
- const commonFunctions = new cfunc();
-
- it('should go to the types page', function() {
- console.log("Go to the types page");
- browser.setLocation("types");
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/types");
- });
-
- it('should verify CSV link exists ', function() {
- console.log("Verify CSV button exists");
-
expect(element(by.css('.dt-button.buttons-csv')).isPresent()).toBe(true);
- });
-
- it('should toggle the visibility of the table columns leaving only one
visible', function() {
- browser.driver.findElement(by.id('toggleColumns')).click();
-
element.all(by.tagName('input[type=checkbox]')).each(function(item) {
- item.click();
- });
-
- let rowColumns = element.all(by.css('#typesTable tr:first-child
th'));
- expect(rowColumns.count()).toBe(1);
- });
-
-});
diff --git a/traffic_portal/test/e2e_deprecated/users/pageData.js
b/traffic_portal/test/e2e_deprecated/users/pageData.js
deleted file mode 100644
index b8dda9f..0000000
--- a/traffic_portal/test/e2e_deprecated/users/pageData.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-module.exports = function(){
- this.username=element(by.name('uName'));
- this.fullName=element(by.name('fullName'));
- this.email=element(by.name('email'));
- this.roleName=element(by.name('role'));
- this.tenantId=element(by.name('tenantId'));
- this.localPasswd=element(by.name('uPass'));
- this.confirmLocalPasswd=element(by.name('confirmPassword'));
- this.registerSent=element(by.name('registrationSent'));
- this.createButton=element(by.buttonText('Create'));
- this.registerNewUserButton=element(by.name('createRegisterUserButton'));
- this.registerEmailButton=element(by.buttonText('Send Registration'));
- this.updateButton=element(by.buttonText('Update'));
-
this.searchFilter=element(by.id('usersTable_filter')).element(by.css('label
input'));
-};
diff --git a/traffic_portal/test/e2e_deprecated/users/users-spec.js
b/traffic_portal/test/e2e_deprecated/users/users-spec.js
deleted file mode 100644
index 382fca8..0000000
--- a/traffic_portal/test/e2e_deprecated/users/users-spec.js
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-var pd = require('./pageData.js');
-var cfunc = require('../common/commonFunctions.js');
-
-describe('Traffic Portal Users Test Suite', function() {
- const pageData = new pd();
- const commonFunctions = new cfunc();
- const myNewUser = {
- username: 'user-' +
commonFunctions.shuffle('abcdefghijklmonpqrstuvwxyz0123456789'),
- fullName: 'test-' +
commonFunctions.shuffle('abcdefghijklmonpqrstuvwxyz0123456789'),
- email: 'test@cdn.' +
commonFunctions.shuffle('abcdefghijklmonpqrstuvwxyz') + '.com',
- localPasswd:
commonFunctions.shuffle('abcdefghijklmonpqrstuvwxyz'),
- };
- const myNewRegisteredUser = {
- email: 'test1@cdn.' +
commonFunctions.shuffle('abcdefghijklmonpqrstuvwxyz') + '.com'
- };
-
- it('should go to the users page', function() {
- console.log("Go to the users page");
- browser.setLocation("users");
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/users");
- });
-
- it('should verify CSV link exists ', function() {
- console.log("Verify CSV button exists");
-
expect(element(by.css('.dt-button.buttons-csv')).isPresent()).toBe(true);
- });
-
- it('should toggle the visibility of the first table column ',
function() {
- browser.driver.findElement(by.id('toggleColumns')).click();
- let first = element.all(by.css('input[type=checkbox]')).first();
- expect(first.isSelected()).toBe(true);
- first.click();
- expect(first.isSelected()).toBe(false);
- let tableColumns = element.all(by.css('#usersTable
tr:first-child td'));
- expect(tableColumns.count()).toBe(4);
- first.click();
- });
-
- it('should open new users form page', function() {
- console.log("Open new users form page");
- browser.driver.findElement(by.name('createUserButton')).click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/users/new");
- });
-
- it('should create a new user', function () {
- console.log("Creating a new user");
- expect(pageData.createButton.isEnabled()).toBe(false);
- pageData.username.sendKeys(myNewUser.username);
- pageData.fullName.sendKeys(myNewUser.fullName);
- pageData.email.sendKeys(myNewUser.email);
- commonFunctions.selectDropdownbyNum(pageData.roleName, 1);
- commonFunctions.selectDropdownbyNum(pageData.tenantId, 1);
- pageData.localPasswd.sendKeys(myNewUser.localPasswd);
- pageData.confirmLocalPasswd.sendKeys(myNewUser.localPasswd);
- expect(pageData.createButton.isEnabled()).toBe(true);
- pageData.createButton.click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/users");
- });
-
- it('should update a user', function() {
- console.log('Updating the new user: ' + myNewUser.username);
- browser.sleep(250);
- pageData.searchFilter.sendKeys(myNewUser.username);
- browser.sleep(250);
- element.all(by.repeater('u in ::users')).filter(function(row){
- return
row.element(by.name('username')).getText().then(function(val){
- return val === myNewUser.username;
- });
- }).get(0).click();
- browser.sleep(1000);
- pageData.fullName.clear();
- pageData.fullName.sendKeys(myNewUser.fullName + ' updated');
- pageData.updateButton.click();
- expect(pageData.fullName.getText() === myNewUser.fullName + '
updated');
- });
-
- it('should open new registered users form page', function() {
- console.log("Open new register users form page");
- browser.setLocation("users");
- pageData.registerNewUserButton.click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/users/register");
- });
-
- it('should create a new registered user', function () {
- console.log("Creating a new registered user");
- expect(pageData.registerEmailButton.isEnabled()).toBe(false);
- pageData.email.sendKeys(myNewRegisteredUser.email);
- commonFunctions.selectDropdownbyNum(pageData.roleName, 2);
- commonFunctions.selectDropdownbyNum(pageData.tenantId, 2);
- expect(pageData.registerEmailButton.isEnabled()).toBe(true);
- pageData.registerEmailButton.click();
-
expect(browser.getCurrentUrl().then(commonFunctions.urlPath)).toEqual(commonFunctions.urlPath(browser.baseUrl)+"#!/users/register");
- });
-
- it('should update a new registered user', function() {
- console.log('Updating the new registered user: ' +
myNewRegisteredUser.email);
- browser.setLocation("users");
- pageData.searchFilter.clear();
- browser.sleep(250);
- pageData.searchFilter.sendKeys(myNewRegisteredUser.email);
- browser.sleep(250);
- element.all(by.repeater('u in ::users')).filter(function(row){
- return
row.element(by.name('email')).getText().then(function(val){
- return val === myNewRegisteredUser.email;
- });
- }).get(0).click();
- browser.sleep(1000);
- pageData.fullName.clear();
- pageData.fullName.sendKeys('test1 updated');
-
expect(pageData.registerSent.getAttribute('readOnly')).toBe('true');
- pageData.updateButton.click();
- expect(pageData.fullName.getText() === 'test1 updated');
- });
-
-});
