You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by ma...@apache.org on 2016/09/07 13:16:30 UTC
[1/3] syncope git commit: [SYNCOPE-853] fix jasmine timeout error
Repository: syncope
Updated Branches:
refs/heads/master 7a7d415cd -> 0d97f4515
[SYNCOPE-853] fix jasmine timeout error
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/1e5f620c
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/1e5f620c
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/1e5f620c
Branch: refs/heads/master
Commit: 1e5f620cfe8249f779ae51add8a8fcc35931dd7a
Parents: ef5784b
Author: Matteo Di Carlo <ma...@tirasa.net>
Authored: Wed Sep 7 15:13:31 2016 +0200
Committer: Matteo Di Carlo <ma...@tirasa.net>
Committed: Wed Sep 7 15:13:31 2016 +0200
----------------------------------------------------------------------
.../enduser/protractor/protractor-conf.js | 30 +++++-----
.../client/enduser/protractor/tests/abstract.js | 21 +++++--
.../client/enduser/protractor/tests/create.js | 4 +-
.../client/enduser/protractor/tests/edituser.js | 60 +++++++++++---------
.../client/enduser/protractor/tests/login.js | 9 ++-
5 files changed, 69 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/1e5f620c/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/protractor-conf.js
----------------------------------------------------------------------
diff --git a/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/protractor-conf.js b/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/protractor-conf.js
index 1a063c7..52b5977 100644
--- a/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/protractor-conf.js
+++ b/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/protractor-conf.js
@@ -17,18 +17,20 @@
* under the License.
*/
exports.config = {
- directConnect: false,
-
- capabilities: {
- 'browserName': 'phantomjs',
- 'phantomjs.binary.path': '@phantomjs.binary.path@',
- 'phantomjs.ghostdriver.cli.args': ['--loglevel=DEBUG']
- },
-
- allScriptsTimeout: 241000,
-
- // Spec patterns are relative to the current working directly when protractor is called.
- specs: ['tests/*.js'],
-
- exclude: ['tests/abstract.js'],
+ directConnect: false,
+ capabilities: {
+ 'browserName': 'phantomjs',
+ 'phantomjs.binary.path': '@phantomjs.binary.path@',
+ 'phantomjs.ghostdriver.cli.args': ['--loglevel=DEBUG']
+ },
+
+ allScriptsTimeout: 241000,
+
+ jasmineNodeOpts: {
+ defaultTimeoutInterval: 2500000
+ },
+
+ // Spec patterns are relative to the current working directly when protractor is called.
+ specs: ['tests/*.js'],
+ exclude: ['tests/abstract.js']
};
http://git-wip-us.apache.org/repos/asf/syncope/blob/1e5f620c/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/abstract.js
----------------------------------------------------------------------
diff --git a/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/abstract.js b/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/abstract.js
index b1f06f0..6c306ea 100644
--- a/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/abstract.js
+++ b/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/abstract.js
@@ -17,13 +17,11 @@
* under the License.
*/
-var home = 'http://localhost:9080/syncope-enduser/app/';
exports.doCreate = function () {
describe('doCreate', function () {
it('create donizetti', function () {
- browser.get(home);
browser.wait(element(by.id('register')).isPresent());
element(by.id('register')).click();
@@ -49,8 +47,9 @@ exports.doCreate = function () {
element.all(by.id('next')).first().click();
- element(by.id('save')).click();
-
+ element.all(by.id('cancel')).last().click();
+
+
});
});
};
@@ -67,9 +66,19 @@ exports.doLogin = function (username, password) {
expect(element(by.model('user.username')).getAttribute('value')).toEqual(username);
-// element(by.id('logout')).click();
});
});
-}
+};
+exports.goHome = function () {
+ var home = 'http://localhost:9080/syncope-enduser/app/';
+ browser.get(home);
+};
+
+exports.doNext = function () {
+ element.all(by.id('next')).last().click();
+};
+exports.doCancel = function () {
+ element.all(by.id('cancel')).last().click();
+};
http://git-wip-us.apache.org/repos/asf/syncope/blob/1e5f620c/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/create.js
----------------------------------------------------------------------
diff --git a/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/create.js b/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/create.js
index 88a3f5b..53ef48d 100644
--- a/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/create.js
+++ b/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/create.js
@@ -18,7 +18,7 @@
*/
var abstract = require('./abstract.js');
-
+abstract.goHome();
abstract.doCreate();
describe('waitSuccess', function () {
@@ -26,5 +26,3 @@ describe('waitSuccess', function () {
browser.wait(element(by.id('redirect')).isPresent());
});
});
-
-//abstract.doLogin("donizetti", "password123");
http://git-wip-us.apache.org/repos/asf/syncope/blob/1e5f620c/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/edituser.js
----------------------------------------------------------------------
diff --git a/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/edituser.js b/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/edituser.js
index 3b9eeff..c108824 100644
--- a/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/edituser.js
+++ b/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/edituser.js
@@ -17,22 +17,22 @@
* under the License.
*/
-//var abstract = require('./abstract.js');
+var abstract = require('./abstract.js');
describe('syncope enduser user edit', function () {
- function next() {
- element.all(by.id('next')).last().click();
- }
- ;
-
- function cancel() {
- element.all(by.id('cancel')).last().click();
+ function waitSpinner() {
+ element.all(by.css('treasure-overlay-spinner')).isDisplayed().then(function (result) {
+ if (result) {
+ browser.driver.sleep(3000);
+ }
+ });
}
;
it('should edit user credentials', function () {
- browser.get('http://localhost:9080/syncope-enduser/app/');
+
+ abstract.goHome();
//login
element(by.model('credentials.username')).sendKeys('bellini');
@@ -45,8 +45,6 @@ describe('syncope enduser user edit', function () {
get(0).click();
element(by.id('login-btn')).click();
-// abstract.doLogin("bellini", "password");
-
//credential
element(by.model('user.username')).clear();
element(by.model('user.username')).sendKeys('bellini');
@@ -59,33 +57,37 @@ describe('syncope enduser user edit', function () {
.last();
selectedSecQuestion.click();
element(by.model('user.securityAnswer')).sendKeys('Agata Ferlito');
- browser.driver.sleep(1000);
- next();
+ abstract.doNext();
//groups
var group = element(by.model('dynamicForm.selectedGroups'));
var selectedGroup = group.element(by.css('.ui-select-search'));
group.click();
- // add "additional", a group with type extensions, and "root".
selectedGroup.sendKeys('additional');
element.all(by.css('.ui-select-choices-row-inner span')).first().click();
+ waitSpinner();
+
selectedGroup.sendKeys('root');
element.all(by.css('.ui-select-choices-row-inner span')).first().click();
- browser.driver.sleep(1000);
- next();
+ waitSpinner();
+
+ abstract.doNext();
//plainSchemas
- // count groups in plainschemas: "own" and "additional".
element.all(by.repeater('groupSchema in dynamicForm.groupSchemas')).then(function (groupSchema) {
expect(groupSchema.length).toBe(2);
- })
- // fills own fields
+ });
+
element(by.css('[name="fullname"]')).clear();
element(by.css('[name="fullname"]')).sendKeys('Vincenzo Bellini');
+ browser.manage().timeouts().pageLoadTimeout(5000);
+
element(by.css('[name="userId"]')).clear();
element(by.css('[name="userId"]')).sendKeys('bellini@apache.org');
- var selectedDate = element(by.model('selectedDate')).click();
+ browser.manage().timeouts().pageLoadTimeout(5000);
+
+ var selectedDate = element(by.model('selectedDate'));
selectedDate.clear();
selectedDate.sendKeys('2009-06-21');
element(by.css('[name="firstname"]')).clear();
@@ -94,15 +96,19 @@ describe('syncope enduser user edit', function () {
element(by.css('[name="surname"]')).sendKeys('Bellini');
element(by.css('[name="ctype"]')).clear();
element(by.css('[name="ctype"]')).sendKeys('bellinictype');
- next();
+
+ abstract.doNext();
+
//derSchemas
- next();
+ abstract.doNext();
+
//virSchemas
- next();
+ abstract.doNext();
+
//Resources
- next();
- browser.driver.sleep(1000);
- element.all(by.id('cancel')).last().click();
- browser.driver.sleep(1000);
+ abstract.doNext();
+
+ //Captcha
+ abstract.doCancel();
});
});
http://git-wip-us.apache.org/repos/asf/syncope/blob/1e5f620c/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/login.js
----------------------------------------------------------------------
diff --git a/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/login.js b/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/login.js
index 8cf7b78..23ec3d5 100644
--- a/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/login.js
+++ b/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/login.js
@@ -17,15 +17,12 @@
* under the License.
*/
-//var abstract = require('./abstract.js');
-
-//abstract.doLogin("rossini", "password");
-
+var abstract = require('./abstract.js');
describe('syncope enduser user login', function () {
it('should login user', function () {
- browser.get('http://localhost:9080/syncope-enduser/app/');
+ abstract.goHome();
element(by.model('credentials.username')).sendKeys('rossini');
element(by.model('credentials.password')).sendKeys('password');
@@ -35,6 +32,8 @@ describe('syncope enduser user login', function () {
});
element.all(by.options('language.name for language in languages.availableLanguages track by language.id')).
get(1).click();
+ browser.driver.sleep(3000);
+
element(by.id('login-btn')).click();
});
[3/3] syncope git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/syncope
Posted by ma...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/syncope
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/0d97f451
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/0d97f451
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/0d97f451
Branch: refs/heads/master
Commit: 0d97f451542c42665a10c8e5ec2a07212d3163e8
Parents: 4715ef1 7a7d415
Author: Matteo Di Carlo <ma...@tirasa.net>
Authored: Wed Sep 7 15:15:31 2016 +0200
Committer: Matteo Di Carlo <ma...@tirasa.net>
Committed: Wed Sep 7 15:15:31 2016 +0200
----------------------------------------------------------------------
.../syncope/core/logic/CamelRouteLogic.java | 14 +++++-
.../camel/AbstractCamelProvisioningManager.java | 14 +++---
.../core/provisioning/camel/CamelException.java | 32 +++++++++++++
.../provisioning/camel/SyncopeCamelContext.java | 47 +++++++++++++-------
pom.xml | 4 ++
5 files changed, 85 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
[2/3] syncope git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/syncope
Posted by ma...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/syncope
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/4715ef1e
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/4715ef1e
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/4715ef1e
Branch: refs/heads/master
Commit: 4715ef1ea909a932b3cf3d4874404480e8bdc889
Parents: 1e5f620 bbee3af
Author: Matteo Di Carlo <ma...@tirasa.net>
Authored: Wed Sep 7 15:14:02 2016 +0200
Committer: Matteo Di Carlo <ma...@tirasa.net>
Committed: Wed Sep 7 15:14:02 2016 +0200
----------------------------------------------------------------------
.../common/lib/search/SearchableFields.java | 2 +-
.../persistence/jpa/dao/JPAAnySearchDAO.java | 35 +++++++++-----------
2 files changed, 17 insertions(+), 20 deletions(-)
----------------------------------------------------------------------