Merge branch 'release/v4.2.1-3'

cloudogu · Sep 8, 2021 · 2668b89 · 2668b89
2 parents 7652d4e + 37b83c6
commit 2668b89
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [v4.2.1-3] - 2021-09-08
+### Changed
+- update version of CAS plugin to 1.4.6 #63
+
 ## [v4.2.1-2] - 2021-07-30
 ### Changed
 - update version of CAS plugin to 1.4.4 #61

diff --git a/Dockerfile b/Dockerfile
@@ -2,14 +2,14 @@
 FROM registry.cloudogu.com/official/base:3.12.4-1
 
 LABEL NAME="official/redmine" \
-   VERSION="4.2.1-2" \
+   VERSION="4.2.1-3" \
    maintainer="robert.auer@cloudogu.com"
 
 # This Dockerfile is based on https://github.com/docker-library/redmine/blob/master/4.0/alpine/Dockerfile
 
 # set environment variables
 ENV REDMINE_VERSION=4.2.1 \
-    CAS_PLUGIN_VERSION=1.4.4 \
+    CAS_PLUGIN_VERSION=1.4.6 \
     ACTIVERECORD_SESSION_STORE_PLUGIN_VERSION=0.1.0 \
     EXTENDED_REST_API_PLUGIN_VERSION=1.0.0 \
     RUBYCASVERSION=2.3.15 \
@@ -19,7 +19,7 @@ ENV REDMINE_VERSION=4.2.1 \
     SERVICE_TAGS=webapp \
     RAILS_ENV=production \
     REDMINE_TARGZ_SHA256=ad4109c3425f1cfe4c8961f6ae6494c76e20d81ed946caa1e297d9eda13b41b4 \
-    CAS_PLUGIN_TARGZ_SHA256=36efac1229af0e2830a9c6a45eff1c1a3e83afbd2aded0bf4c85cb17d5d93a25 \
+    CAS_PLUGIN_TARGZ_SHA256=5375f9ad0de9dc0d3be874ff7b0c9292878df71f9f18496aa34e9053dc4ed29d \
     EXTENDED_REST_API_TARGZ_SHA256=eedd4c8a9a707a8ac0f499d79c686ed8faf8bc603118a54c18e4829faaeee320 \
     ACTIVERECORD_TARGZ_SHA256=a5d3a5ac6c5329212621bab128a2f94b0ad6bb59084f3cc714786a297bcdc7ee \
     RUBYCAS_TARGZ_SHA256=9ca9b2e020c4f12c3c7e87565b9aa19dda130912138d80ad6775e5bdc2d4ca66 \

diff --git a/dogu.json b/dogu.json
@@ -1,6 +1,6 @@
 {
   "Name": "official/redmine",
-  "Version": "4.2.1-2",
+  "Version": "4.2.1-3",
   "DisplayName": "Redmine",
   "Description": "Redmine is a flexible project management web application",
   "Category": "Development Apps",

diff --git a/integrationTests/cypress/integration/dogu_integration_test_lib/cas_browser.feature b/integrationTests/cypress/integration/dogu_integration_test_lib/cas_browser.feature
@@ -1,3 +1,4 @@
+# DO NOT EDIT! These feature files are provided by the dogu integration test library.
 Feature: Browser-based CAS login and logout functionality
 
   @requires_testuser
@@ -20,7 +21,7 @@ Feature: Browser-based CAS login and logout functionality
     When the user opens the dogu start page
     And the user types in wrong login credentials
     And the user clicks the login button
-    Then the login page informs the user about invalid credentials
+    Then the login page informs the user about not recognizing the given user account
 
   @requires_testuser
   Scenario: logged in user can log out via logout button (front-channel)

diff --git a/integrationTests/cypress/integration/dogu_integration_test_lib/privileges.feature b/integrationTests/cypress/integration/dogu_integration_test_lib/privileges.feature
@@ -1,4 +1,5 @@
-Feature: Browser-based CAS login and logout functionality
+# DO NOT EDIT! These feature files are provided by the dogu integration test library.
+Feature: Automatic grant of privileges when logging into a dogu
 
   @requires_testuser
   Scenario: ces user with default privileges has default privileges in the dogu

diff --git a/integrationTests/package.json b/integrationTests/package.json
@@ -2,7 +2,7 @@
   "dependencies": {
     "cypress": "7.1.0",
     "cypress-cucumber-preprocessor": "4.1.0",
-    "@cloudogu/dogu-integration-test-library": "0.1.7-development"
+    "@cloudogu/dogu-integration-test-library": "0.2.2"
   },
   "scripts": {
     "updateTests": "mkdir -p cypress/integration/dogu_integration_test_lib && cp -r node_modules/@cloudogu/dogu-integration-test-library/lib/integration/* cypress/integration/dogu_integration_test_lib"

diff --git a/integrationTests/yarn.lock b/integrationTests/yarn.lock
@@ -729,10 +729,10 @@
     "@babel/helper-validator-identifier" "^7.12.11"
     to-fast-properties "^2.0.0"
 
-"@cloudogu/dogu-integration-test-library@0.1.7-development":
-  version "0.1.7-development"
-  resolved "https://registry.yarnpkg.com/@cloudogu/dogu-integration-test-library/-/dogu-integration-test-library-0.1.7-development.tgz#64845f3227d5c4d686bdb76c0bad2d951d60fa9b"
-  integrity sha512-rYtJnaHgh3TmaOT3lOW8o/uXIsXeja9jSst5r4au2rTKdLAo810u0/R8/0jACbXXtjI9P8s0Ow19eUcDCukr7g==
+"@cloudogu/dogu-integration-test-library@0.2.2":
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@cloudogu/dogu-integration-test-library/-/dogu-integration-test-library-0.2.2.tgz#12fa22e0682a13286a8df14b31607616b12d8ba3"
+  integrity sha512-LxxQ+3in53EeNo9ahPuG6o3RptymtNBMqRrK+YAyPBZgRelZ0/bPFd0lpSFvS4n8NO0y5TsCmbxgRik1GemEKQ==
 
 "@cypress/browserify-preprocessor@^3.0.1":
   version "3.0.1"