You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2014/08/21 06:35:09 UTC
[1/2] git commit: updated portal tests w/ new account,
moved profile test to ignore
Repository: incubator-usergrid
Updated Branches:
refs/heads/master d33cb652b -> b73a3acac
updated portal tests w/ new account, moved profile test to ignore
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/6130345a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/6130345a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/6130345a
Branch: refs/heads/master
Commit: 6130345a1264a149b542cb98eabd7f9861733475
Parents: 0ffb1e9
Author: Rod Simpson <ro...@apigee.com>
Authored: Wed Aug 20 21:10:48 2014 -0700
Committer: Rod Simpson <ro...@apigee.com>
Committed: Wed Aug 20 21:10:48 2014 -0700
----------------------------------------------------------------------
portal/tests/protractor-ignore/profile.spec.js | 77 +++++++++++++++++++++
portal/tests/protractor/profile.spec.js | 77 ---------------------
portal/tests/protractor/util.js | 4 +-
portal/tests/protractorConf.js | 4 +-
4 files changed, 81 insertions(+), 81 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6130345a/portal/tests/protractor-ignore/profile.spec.js
----------------------------------------------------------------------
diff --git a/portal/tests/protractor-ignore/profile.spec.js b/portal/tests/protractor-ignore/profile.spec.js
new file mode 100644
index 0000000..5db6972
--- /dev/null
+++ b/portal/tests/protractor-ignore/profile.spec.js
@@ -0,0 +1,77 @@
+'use strict';
+var util = require('./../protractor/util');
+describe('Test User Profile', function () {
+
+ var newUser = 'rsimpson+test2@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(){
+ browser.driver.get(browser.baseUrl+'#!/profile');
+ element(by.id('account-link')).click();
+ element(by.model('user.email')).isPresent().then(function() {
+ element(by.id('account-link')).click();
+ element(by.id('profile-link')).click();
+ var email = element(by.model('user.email'));
+ var name = element(by.model('user.name'));
+ email.clear();
+ email.sendKeys(newUser);
+ name.clear();
+ name.sendKeys('rod simpson');
+ element(by.id('button-update-account')).submit();
+ });
+ browser.wait(function() {
+ return element(by.id('userEmail')).getText().then(function(text) {
+ var test = text === newUser;
+ if(test){
+ var name = element(by.model('user.name'));
+ expect(name.getAttribute('value')).toEqual('rod simpson');
+ }
+ return test;
+ });
+ });
+
+ })
+ it('should set my email back',function(){
+ element(by.model('user.email')).isPresent().then(function(){
+ var email = element(by.model('user.email'));
+ email.clear();
+ email.sendKeys(browser.params.login.user);
+ var name = element(by.model('user.name'));
+ name.clear();
+ name.sendKeys('sam jeeps');
+ element(by.id('button-update-account')).submit();
+ })
+ browser.wait(function() {
+ return element(by.id('userEmail')).getText().then(function(text) {
+ var test = text === browser.params.login.user;
+ if(test){
+ var name = element(by.model('user.name'));
+ expect(name.getAttribute('value')).toEqual('sam jeeps');
+ }
+ return test;
+ });
+ });
+ })
+ });
+
+ describe('Test change password',function(){
+ it('should change password to some value',function(){
+ if(browser.params.useSso){
+ //this will not work with sso since its an enterprise config.
+ return;
+ }
+ browser.driver.get(browser.baseUrl+'#!/org-overview');
+ browser.driver.get(browser.baseUrl+'#!/profile');
+ var email = element(by.model('user.email'));
+ email.isPresent().then(function() {
+ expect(email.getAttribute('value')).toEqual(browser.params.login.user);
+ });
+ });
+ });
+});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6130345a/portal/tests/protractor/profile.spec.js
----------------------------------------------------------------------
diff --git a/portal/tests/protractor/profile.spec.js b/portal/tests/protractor/profile.spec.js
deleted file mode 100644
index 13e9bf0..0000000
--- a/portal/tests/protractor/profile.spec.js
+++ /dev/null
@@ -1,77 +0,0 @@
-'use strict';
-var util = require('./util');
-describe('Test User Profile', function () {
-
- 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(){
- browser.driver.get(browser.baseUrl+'#!/profile');
- element(by.id('account-link')).click();
- element(by.model('user.email')).isPresent().then(function() {
- element(by.id('account-link')).click();
- element(by.id('profile-link')).click();
- var email = element(by.model('user.email'));
- var name = element(by.model('user.name'));
- email.clear();
- email.sendKeys(newUser);
- name.clear();
- name.sendKeys('rod simpson');
- element(by.id('button-update-account')).submit();
- });
- browser.wait(function() {
- return element(by.id('userEmail')).getText().then(function(text) {
- var test = text === newUser;
- if(test){
- var name = element(by.model('user.name'));
- expect(name.getAttribute('value')).toEqual('rod simpson');
- }
- return test;
- });
- });
-
- })
- it('should set my email back',function(){
- element(by.model('user.email')).isPresent().then(function(){
- var email = element(by.model('user.email'));
- email.clear();
- email.sendKeys(browser.params.login.user);
- var name = element(by.model('user.name'));
- name.clear();
- name.sendKeys('sam jeeps');
- element(by.id('button-update-account')).submit();
- })
- browser.wait(function() {
- return element(by.id('userEmail')).getText().then(function(text) {
- var test = text === browser.params.login.user;
- if(test){
- var name = element(by.model('user.name'));
- expect(name.getAttribute('value')).toEqual('sam jeeps');
- }
- return test;
- });
- });
- })
- });
-
- describe('Test change password',function(){
- it('should change password to some value',function(){
- if(browser.params.useSso){
- //this will not work with sso since its an enterprise config.
- return;
- }
- browser.driver.get(browser.baseUrl+'#!/org-overview');
- browser.driver.get(browser.baseUrl+'#!/profile');
- var email = element(by.model('user.email'));
- email.isPresent().then(function() {
- expect(email.getAttribute('value')).toEqual(browser.params.login.user);
- });
- });
- });
-});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6130345a/portal/tests/protractor/util.js
----------------------------------------------------------------------
diff --git a/portal/tests/protractor/util.js b/portal/tests/protractor/util.js
index 9118bcb..d800a50 100644
--- a/portal/tests/protractor/util.js
+++ b/portal/tests/protractor/util.js
@@ -127,7 +127,7 @@ module.exports = {
element(by.id('new-user-username')).clear();
element(by.id('new-user-username')).sendKeys(username);
element(by.id('new-user-fullname')).sendKeys('Test ' + username);
- element(by.id('new-user-email')).sendKeys('sfeldman+test' + username + '@apigee.com');
+ element(by.id('new-user-email')).sendKeys('rsimpson+test' + username + '@apigee.com');
element(by.id('new-user-password')).sendKeys('P@ssw0rd1');
element(by.id('new-user-re-password')).sendKeys('P@ssw0rd1');
browser.sleep(1000);
@@ -146,7 +146,7 @@ module.exports = {
browser.wait(function () {
return element(by.id('user-' + username + '-checkbox')).isPresent();
});
-
+
element(by.id('user-' + username + '-checkbox')).isPresent().then(function () {
element(by.id('user-' + username + '-checkbox')).click();
browser.sleep(1000);
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6130345a/portal/tests/protractorConf.js
----------------------------------------------------------------------
diff --git a/portal/tests/protractorConf.js b/portal/tests/protractorConf.js
index 7708bfa..73c4385 100644
--- a/portal/tests/protractorConf.js
+++ b/portal/tests/protractorConf.js
@@ -67,10 +67,10 @@ exports.config = {
},
params: {
login: {
- user: 'sfeldman+apijeep@apigee.com',
+ user: 'rsimpson+test@apigee.com',
password: 'P@ssw0rd1'
},
- orgName:'sfeldmanapijeep',
+ orgName:'rodprotractortests',
appName1:'website',
appName2:'mobile',
useSso:false
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-usergrid
Posted by sf...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/b73a3aca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/b73a3aca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/b73a3aca
Branch: refs/heads/master
Commit: b73a3acace06cdccd2857e2475e6ad6e74f2d197
Parents: 6130345 d33cb65
Author: Shawn Feldman <sf...@apache.org>
Authored: Wed Aug 20 22:14:21 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Wed Aug 20 22:14:21 2014 -0600
----------------------------------------------------------------------
NOTICE | 33 ++++++++++++++++++++
portal/build.sh | 14 +++++++++
portal/scripts/e2e-test.sh | 14 +++++++++
portal/scripts/test.sh | 14 +++++++++
.../maven-metadata-local.xml | 16 ++++++++++
.../apache/usergrid/android/client/Client.java | 16 ++++++++++
.../client/callbacks/ApiResponseCallback.java | 16 ++++++++++
.../client/callbacks/ClientAsyncTask.java | 16 ++++++++++
.../client/callbacks/ClientCallback.java | 16 ++++++++++
.../callbacks/DeviceRegistrationCallback.java | 16 ++++++++++
.../callbacks/GroupsRetrievedCallback.java | 16 ++++++++++
.../client/callbacks/QueryResultsCallback.java | 16 ++++++++++
.../android/client/utils/DeviceUuidFactory.java | 16 ++++++++++
.../android/client/utils/ObjectUtils.java | 16 ++++++++++
.../samples/Books/books/AddBookViewController.h | 14 +++++++++
sdks/ios/samples/Books/books/AppDelegate.h | 14 +++++++++
.../samples/Books/books/BooksViewController.h | 14 +++++++++
.../Books/books/UGSignInViewController.h | 14 +++++++++
.../ios/samples/Browser/browser/UGAppDelegate.h | 14 +++++++++
.../Browser/browser/UGAppViewController.h | 14 +++++++++
.../browser/UGCollectionViewController.h | 14 +++++++++
.../Browser/browser/UGEntityViewController.h | 14 +++++++++
.../Browser/browser/UGSignInViewController.h | 14 +++++++++
.../Browser/browser/UGTextViewController.h | 14 +++++++++
sdks/ios/samples/parties/parties/AppDelegate.h | 14 ++++++++-
.../parties/parties/PartiesViewController.h | 14 ++++++++-
.../parties/parties/PartyViewController.h | 14 ++++++++-
stack/build-tools/pom.xml | 2 +-
stack/cloudbees.xml | 18 +++++++++++
stack/config/pom.xml | 2 +-
.../src/test/resources/usergrid-test.properties | 11 +++++++
stack/core/pom.xml | 2 +-
stack/launcher/pom.xml | 2 +-
.../maven-metadata-local.xml | 16 ++++++++++
.../recaptcha4j/maven-metadata-local.xml | 16 ++++++++++
.../maven-metadata-local.xml | 16 ++++++++++
stack/mongo-emulator/pom.xml | 2 +-
stack/pom.xml | 2 +-
stack/query-validator/pom.xml | 2 +-
stack/rest/pom.xml | 4 +--
.../rest/src/test/resources/project.properties | 15 +++++++++
.../resources/usergrid-custom-test.properties | 15 +++++++++
.../resources/usergrid-rest-deploy-context.xml | 16 ++++++++++
.../test/resources/usergrid-test-context.xml | 16 ++++++++++
stack/services/pom.xml | 2 +-
stack/test-utils/pom.xml | 2 +-
stack/tools/pom.xml | 4 +--
stack/websocket/pom.xml | 2 +-
48 files changed, 567 insertions(+), 17 deletions(-)
----------------------------------------------------------------------