Skip to content

Commit

Permalink
Merge branch 'release/v3.4.8-1'
Browse files Browse the repository at this point in the history
  • Loading branch information
ppxl committed Jan 30, 2019
2 parents 740dd3a + b1e151f commit 350a01d
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 16 deletions.
9 changes: 5 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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="[email protected]"

# 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 \
Expand All @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
@@ -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') {
Expand Down
12 changes: 1 addition & 11 deletions integrationTests/cas-rest.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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', () => {

Expand All @@ -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);
Expand All @@ -45,6 +34,7 @@ describe('cas rest tests', () => {
'X-Redmine-API-Key': apiKey
})
.expect(200);
await driver.quit();
});

test('check cas attributes', async() => {
Expand Down

0 comments on commit 350a01d

Please sign in to comment.