Merge pull request #128 from RADAR-CNS/master

Merge release 0.2.1 back into dev
RADAR-base · Nov 13, 2017 · 0ec8c2c · 0ec8c2c
2 parents 03fada4 + e3956d2
commit 0ec8c2c
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/build.gradle b/build.gradle
@@ -30,7 +30,7 @@ plugins {
 
 allprojects {
     group 'org.radarcns'
-    version '0.2.0'
+    version '0.2.1'
 
     apply plugin: 'java'
     apply plugin: 'java-library'

diff --git a/oauth-client-util/README.md b/oauth-client-util/README.md
@@ -10,7 +10,7 @@ Quickstart:
 
 ```groovy
 dependencies {
-  compile group: 'org.radarcns', name: 'oauth-client-util', version: '0.1'
+  compile group: 'org.radarcns', name: 'oauth-client-util', version: '0.2.1'
 }
 ```
 

diff --git a/radar-auth/README.md b/radar-auth/README.md
@@ -10,7 +10,7 @@ Add the dependency to your project.
 
 Gradle:
 ```groovy
-compile group: 'org.radarcns', name: 'radar-auth', version: '0.1'
+compile group: 'org.radarcns', name: 'radar-auth', version: '0.2.1'
 ```
 
 The library expects the identity server configuration in a file called `radar-is.yml`. Either set 

diff --git a/src/test/javascript/e2e/account/account.spec.ts b/src/test/javascript/e2e/account/account.spec.ts
@@ -8,10 +8,17 @@ describe('account', () => {
     const login = element(by.id('login'));
     const logout = element(by.id('logout'));
 
+    var originalTimeOut;
+
     beforeAll(() => {
         browser.get('/');
     });
 
+    beforeEach(() => {
+        originalTimeOut = jasmine.DEFAULT_TIMEOUT_INTERVAL;
+        jasmine.DEFAULT_TIMEOUT_INTERVAL = 240000;
+    });
+
     it('should fail to login with bad password', () => {
         const expect1 = /home.title/;
         element.all(by.css('h1')).first().getAttribute('jhiTranslate').then((value) => {
@@ -103,6 +110,10 @@ describe('account', () => {
         element(by.css('button[type=submit]')).click();
     });
 
+    afterEach(() => {
+        jasmine.DEFAULT_TIMEOUT_INTERVAL = originalTimeOut;
+    });
+
     afterAll(() => {
         accountMenu.click();
         logout.click();

diff --git a/src/test/javascript/protractor.conf.js b/src/test/javascript/protractor.conf.js
@@ -29,7 +29,7 @@ exports.config = {
 
     jasmineNodeOpts: {
         showColors: true,
-        defaultTimeoutInterval: 60000,
+        defaultTimeoutInterval: 120000,
         print: function() {}
     },