Merge pull request #42 from shawnfeldman/master
adding generic test account
diff --git a/portal/tests/protractor/applications.spec.js b/portal/tests/protractor/applications.spec.js
index a0393a2..ebff82e 100644
--- a/portal/tests/protractor/applications.spec.js
+++ b/portal/tests/protractor/applications.spec.js
@@ -13,15 +13,15 @@
browser.driver.get(browser.baseUrl+'/#!/app-overview/summary');
browser.wait(function(){
return element(by.id('app-overview-title')).getText().then(function(text){
- return text===appName1.toUpperCase();
+ return text===appName2.toUpperCase();
})
})
element(by.id('app-overview-title')).isPresent().then(function(){
element(by.id('current-app-selector')).click();
- element(by.id('app-'+appName2+'-link-id')).click();
+ element(by.id('app-'+appName1+'-link-id')).click();
browser.wait(function() {
return element(by.id('app-overview-title')).getText().then(function(text) {
- return text === appName2.toUpperCase();
+ return text === appName1.toUpperCase();
});
});
});
diff --git a/portal/tests/protractor/forgotPassword.spec.js b/portal/tests/protractor/forgotPassword.spec.js
index 715de21..eb57878 100644
--- a/portal/tests/protractor/forgotPassword.spec.js
+++ b/portal/tests/protractor/forgotPassword.spec.js
@@ -18,6 +18,7 @@
});
element(by.id('button-forgot-password')).isPresent().then(function () {
element(by.id('button-forgot-password')).click();
+ browser.driver.get(browser.baseUrl+'/#!/forgot-password')
});
browser.wait(function () {
return browser.driver.getCurrentUrl().then(function (url) {
diff --git a/portal/tests/protractor/profile.spec.js b/portal/tests/protractor/profile.spec.js
index f775cce..9166af2 100644
--- a/portal/tests/protractor/profile.spec.js
+++ b/portal/tests/protractor/profile.spec.js
@@ -2,16 +2,16 @@
var util = require('./util');
describe('Test User Profile', function () {
- var newUser = 'sfeldman+protractor@apigee.com';
+ var newUser = 'sfeldman+apijeeps2@apigee.com';
beforeEach(function(){
util.login();
})
describe('Test Changing profile values',function(){
+ if(browser.params.useSso){
+ //this will not work with sso since its an enterprise config.
+ return;
+ }
it('should set email to some random value',function(){
- if(browser.params.useSso){
- //this will not work with sso since its an enterprise config.
- return;
- }
browser.driver.get(browser.baseUrl+'/#!/profile');
element(by.id('account-link')).click();
element(by.model('user.email')).isPresent().then(function() {
@@ -22,7 +22,7 @@
email.clear();
email.sendKeys(newUser);
name.clear();
- name.sendKeys('shawn feldman test');
+ name.sendKeys('rod simpson');
element(by.id('button-update-account')).submit();
});
browser.wait(function() {
@@ -30,7 +30,7 @@
var test = text === newUser;
if(test){
var name = element(by.model('user.name'));
- expect(name.getAttribute('value')).toEqual('shawn feldman test');
+ expect(name.getAttribute('value')).toEqual('rod simpson');
}
return test;
});
@@ -44,7 +44,7 @@
email.sendKeys(browser.params.login.user);
var name = element(by.model('user.name'));
name.clear();
- name.sendKeys('shawn feldman');
+ name.sendKeys('sam jeeps');
element(by.id('button-update-account')).submit();
})
browser.wait(function() {
@@ -52,7 +52,7 @@
var test = text === browser.params.login.user;
if(test){
var name = element(by.model('user.name'));
- expect(name.getAttribute('value')).toEqual('shawn feldman');
+ expect(name.getAttribute('value')).toEqual('sam jeeps');
}
return test;
});
diff --git a/portal/tests/protractor/users.spec.js b/portal/tests/protractor/users.spec.js
index 657368f..d295997 100644
--- a/portal/tests/protractor/users.spec.js
+++ b/portal/tests/protractor/users.spec.js
@@ -12,6 +12,9 @@
it('should add and then delete', function () {
var dateString = Date.now().toString();
+ browser.wait(function(){
+ return browser.driver.findElement(by.id("new-user-button")).isDisplayed();
+ });
element(by.id("new-user-button")).isPresent().then(function(){
element(by.id("new-user-button")).click();
});
@@ -21,7 +24,7 @@
element(by.id('new-user-username')).clear();
element(by.id('new-user-username')).sendKeys('test' + dateString);
element(by.id('new-user-fullname')).sendKeys('Test ' + dateString);
- element(by.id('new-user-email')).sendKeys('test' + dateString + '@apigee.com');
+ element(by.id('new-user-email')).sendKeys('sfeldman+test' + dateString + '@apigee.com');
element(by.id('new-user-password')).sendKeys(dateString);
element(by.id('new-user-re-password')).sendKeys(dateString);
browser.sleep(1000);
diff --git a/portal/tests/protractorConf.js b/portal/tests/protractorConf.js
index fdd8bbf..aabb83d 100644
--- a/portal/tests/protractorConf.js
+++ b/portal/tests/protractorConf.js
@@ -63,12 +63,12 @@
},
params: {
login: {
- user: 'sfeldman+prod@apigee.com',
- password: '8dyCcdMoV13x'
+ user: 'sfeldman+apijeeps@apigee.com',
+ password: 'p@ssw0rd1'
},
- orgName:'rippela',
- appName1:'test',
- appName2:'sandbox',
+ orgName:'apijeeps',
+ appName1:'website',
+ appName2:'mobile',
useSso:false
},
