From 438ba7556b21bf8b0e42c476e8242b0fd7cf1a0b Mon Sep 17 00:00:00 2001 From: Robert Auer Date: Thu, 24 Jan 2019 10:55:44 +0100 Subject: [PATCH 1/4] Bump redmine to v3.4.8; #16 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f0049d9..a0babbf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,11 +2,11 @@ FROM registry.cloudogu.com/official/base:3.7-4 LABEL NAME="official/redmine" \ - VERSION="3.4.6" \ + VERSION="3.4.8" \ maintainer="robert.auer@cloudogu.com" # set environment variables -ENV REDMINE_VERSION=3.4.6 \ +ENV REDMINE_VERSION=3.4.8 \ CAS_PLUGIN_VERSION=1.2.13 \ ACTIVERECORD_SESSION_STORE_PLUGIN_VERSION=0.0.1 \ RUBYCASVERSION=2.3.13 \ From a4030d304cfbde53252c9c5f8ff4f24144dc4e08 Mon Sep 17 00:00:00 2001 From: Robert Auer Date: Mon, 28 Jan 2019 08:43:27 +0100 Subject: [PATCH 2/4] Install rdoc which is not included in redmine Gemfile any more; #16 --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a0babbf..0b9be93 100644 --- a/Dockerfile +++ b/Dockerfile @@ -33,8 +33,9 @@ RUN set -x \ ruby-rmagick \ tzdata \ ruby \ - ruby-bigdecimal \ - ruby-bundler \ + ruby-bigdecimal \ + ruby-bundler \ + ruby-rdoc \ tini \ libffi \ su-exec \ From e5ae4c9c488cc705b9d914b0a91ea8aa444d465d Mon Sep 17 00:00:00 2001 From: Robert Auer Date: Mon, 28 Jan 2019 09:08:00 +0100 Subject: [PATCH 3/4] Remove unnecessary webdriver creation in cas REST test; #16 --- integrationTests/cas-rest.spec.js | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/integrationTests/cas-rest.spec.js b/integrationTests/cas-rest.spec.js index b70e4cf..a6905fd 100644 --- a/integrationTests/cas-rest.spec.js +++ b/integrationTests/cas-rest.spec.js @@ -11,16 +11,6 @@ jest.setTimeout(30000); // disable certificate validation process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'; -let driver; - -beforeEach(async() => { - driver = utils.createDriver(webdriver); - await driver.manage().window().maximize(); -}); - -afterEach(async () => { - await driver.quit(); -}); describe('cas rest tests', () => { @@ -32,7 +22,6 @@ describe('cas rest tests', () => { }); test('authenticate with API key', async() => { - const driver = await utils.createDriver(webdriver); await utils.login(driver, config.redmineContextPath + '/my/api_key'); await driver.wait(until.elementLocated(By.css('div.box pre')), 5000); @@ -45,6 +34,7 @@ describe('cas rest tests', () => { 'X-Redmine-API-Key': apiKey }) .expect(200); + await driver.quit(); }); test('check cas attributes', async() => { From 51743e16f365e23710414e8bac8afe53f595a907 Mon Sep 17 00:00:00 2001 From: Robert Auer Date: Mon, 28 Jan 2019 09:19:06 +0100 Subject: [PATCH 4/4] Update dogu-build-lib and zalenium-build-lib to current versions; #16 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 537eb8a..68a5935 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,5 @@ #!groovy -@Library(['github.com/cloudogu/dogu-build-lib@a9f0e688', 'github.com/cloudogu/zalenium-build-lib@d8b74327']) _ +@Library(['github.com/cloudogu/dogu-build-lib@1e5e2a63', 'github.com/cloudogu/zalenium-build-lib@30923630']) _ import com.cloudogu.ces.dogubuildlib.* node('vagrant') {