Merge pull request #445 from nextcloud/enh/noid/bump-for-20

Bump version, require 20, adjust integration tests

.drone.yml

@@ -77,7 +77,6 @@ steps:
       - chown -R apache:apache /var/www/html/
       - scl enable rh-php72 "bash -c 'cd /var/www/html/apps/user_saml/tests/integration && vendor/bin/behat'"
 
-
 trigger:
   branch:
     - master
@@ -86,49 +85,3 @@ trigger:
     - push
 
 type: docker
----
-kind: pipeline
-name: tests-19
-
-clone:
-    depth: 1
-
-steps:
-    - name: php7.3-stable19
-      image: nextcloudci/php7.3:php7.3-5
-      environment:
-          APP_NAME: user_saml
-          CORE_BRANCH: stable19
-          DB: sqlite
-      commands:
-          - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
-          - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
-          - cd ../server/apps/$APP_NAME
-          - cd tests/unit/
-          - phpunit --configuration phpunit.xml
-
-    - name: integration-tests-stable19
-      image: nextcloudci/user_saml_shibboleth-php7.2:user_saml_shibboleth_php7.2-3
-      environment:
-          CORE_BRANCH: stable19
-      commands:
-          - /start.sh &
-          - sleep 7
-          - rm -rf /var/www/html
-          - cd /var/www/
-          - git clone --depth 1 -b $CORE_BRANCH https://github.com/nextcloud/server html
-          - cd /var/www/html && git submodule update --init
-          # use local clone
-          - cp -r /drone/src /var/www/html/apps/user_saml
-          - scl enable rh-php72 "bash -c 'php /var/www/html/occ maintenance:install --database sqlite --admin-pass password; php /var/www/html/occ app:enable user_saml'"
-          - chown -R apache:apache /var/www/html/
-          - scl enable rh-php72 "bash -c 'cd /var/www/html/apps/user_saml/tests/integration && vendor/bin/behat'"
-
-trigger:
-    branch:
-        - master
-    event:
-        - pull_request
-        - push
-
-type: docker

appinfo/info.xml

@@ -16,7 +16,7 @@ The following providers are supported and tested at the moment:
 	* Any other provider that authenticates using the environment variable
 
 While theoretically any other authentication provider implementing either one of those standards is compatible, we like to note that they are not part of any internal test matrix.]]></description>
-	<version>3.2.0</version>
+	<version>3.3.0</version>
 	<licence>agpl</licence>
 	<author>Lukas Reschke</author>
 	<namespace>User_SAML</namespace>
@@ -33,7 +33,7 @@ While theoretically any other authentication provider implementing either one of
 	<screenshot>https://raw.githubusercontent.com/nextcloud/user_saml/master/screenshots/1.png</screenshot>
 	<screenshot>https://raw.githubusercontent.com/nextcloud/user_saml/master/screenshots/2.png</screenshot>
 	<dependencies>
-		<nextcloud min-version="19" max-version="20" />
+		<nextcloud min-version="20" max-version="20" />
 	</dependencies>
 	<commands>
 		<command>OCA\User_SAML\Command\GetMetadata</command>

tests/integration/features/EnvironmentVariable.feature

@@ -5,7 +5,7 @@ Feature: EnvironmentVariable
     And The setting "general-uid_mapping" is set to "REMOTE_USER"
     And The environment variable "REMOTE_USER" is set to "not-provisioned-user"
     When I send a GET request to "http://localhost/index.php/login"
-    Then I should be redirected to "http://localhost/index.php/apps/files/"
+    Then I should be redirected to "http://localhost/index.php/apps/dashboard/"
     Then The user value "id" should be "not-provisioned-user"
     And The last login timestamp of "not-provisioned-user" should not be empty
 
@@ -16,7 +16,7 @@ Feature: EnvironmentVariable
     And The setting "general-uid_mapping" is set to "REMOTE_USER"
     And The environment variable "REMOTE_USER" is set to "provisioned-user"
     When I send a GET request to "http://localhost/index.php/login"
-    Then I should be redirected to "http://localhost/index.php/apps/files/"
+    Then I should be redirected to "http://localhost/index.php/apps/dashboard/"
     Then The user value "id" should be "provisioned-user"
     And The last login timestamp of "provisioned-user" should not be empty
 

tests/integration/features/Shibboleth.feature

@@ -17,7 +17,7 @@ Feature: Shibboleth
      |j_username|j_password|_eventId_proceed|
      |student1  |password  |                |
     And The response should be a SAML redirect page that gets submitted
-    And I should be redirected to "http://localhost/index.php/apps/files/"
+    And I should be redirected to "http://localhost/index.php/apps/dashboard/"
     And The user value "id" should be "student1"
     And The last login timestamp of "student1" should not be empty
 
@@ -61,7 +61,7 @@ Feature: Shibboleth
       |j_username|j_password|_eventId_proceed|
       |student1  |password  |                |
     And The response should be a SAML redirect page that gets submitted
-    And I should be redirected to "http://localhost/index.php/apps/files/"
+    And I should be redirected to "http://localhost/index.php/apps/dashboard/"
     Then The user value "id" should be "student1"
     Then The user value "email" should be ""
     And The user value "display-name" should be "Default displayname of student1"
@@ -86,7 +86,7 @@ Feature: Shibboleth
       |j_username|j_password|_eventId_proceed|
       |student1  |password  |                |
     And The response should be a SAML redirect page that gets submitted
-    And I should be redirected to "http://localhost/index.php/apps/files/"
+    And I should be redirected to "http://localhost/index.php/apps/dashboard/"
     And The user value "id" should be "student1"
     And The user value "email" should be "student1@idptestbed.edu"
     And The user value "display-name" should be "Stud Ent"