Fix broken tests (#30)

Author: fdelavega

.travis.yml

@@ -4,7 +4,7 @@ python:
     - "2.7"
 env:
     - CKANVERSION=2.6.3 POSTGISVERSION=2 INTEGRATION_TEST=true
-    - CKANVERSION=2.7.2 POSTGISVERSION=2
+    - CKANVERSION=2.7.2 POSTGISVERSION=2 IDM_VERSION=v6
     - CKANVERSION=2.7.3 POSTGISVERSION=2 INTEGRATION_TEST=true
     - CKANVERSION=2.8.0 POSTGISVERSION=2 INTEGRATION_TEST=true
 services:

bin/travis-build.bash

@@ -24,6 +24,9 @@ function test_connection {
 echo "This is travis-build.bash..."
 
 echo "Installing the packages that CKAN requires..."
+sudo apt-get clean
+sudo rm -r /var/lib/apt/lists/*
+
 sudo apt-get update -qq
 sudo apt-get install solr-jetty
 
@@ -64,20 +67,23 @@ echo "Installing ckanext-oauth2 and its requirements..."
 python setup.py develop
 
 if [ "$INTEGRATION_TEST" = "true" ]; then
-    sudo sh -c 'echo "\n[ SAN ]\nsubjectAltName=DNS:localhost" >> /etc/ssl/openssl.cnf'
-    sudo openssl req -new -newkey rsa:2048 -days 3650 -nodes -x509 \
-        -subj '/O=API Umbrella/CN=localhost' \
-        -keyout /etc/ssl/self_signed.key -out /usr/local/share/ca-certificates/self_signed.crt \
-        -reqexts SAN -extensions SAN
-
-    sudo update-ca-certificates
-    export REQUESTS_CA_BUNDLE="/etc/ssl/certs/ca-certificates.crt"
-    docker network create main
-    docker run -d --network main -e MYSQL_ROOT_PASSWORD=idm -e MYSQL_ROOT_HOST=% --name mysql mysql/mysql-server:5.7.21
-    docker run -d -p 443:443 --network main -e DATABASE_HOST=mysql -v "${TRAVIS_BUILD_DIR}/ci/idm-config.js:/opt/fiware-idm/config.js:ro" -v /etc/ssl/self_signed.key:/opt/fiware-idm/certs/self_signed.key:ro -v /usr/local/share/ca-certificates/self_signed.crt:/opt/fiware-idm/certs/self_signed.crt:ro --name idm fiware/idm
-
-    # Wait until idm is ready
-    test_connection 'KeyRock' https://localhost:443
+        sudo sh -c 'echo "\n[ SAN ]\nsubjectAltName=DNS:localhost" >> /etc/ssl/openssl.cnf'
+        sudo openssl req -new -newkey rsa:2048 -days 3650 -nodes -x509 \
+            -subj '/O=API Umbrella/CN=localhost' \
+            -keyout /etc/ssl/self_signed.key -out /usr/local/share/ca-certificates/self_signed.crt \
+            -reqexts SAN -extensions SAN
+
+        sudo update-ca-certificates
+        export REQUESTS_CA_BUNDLE="/etc/ssl/certs/ca-certificates.crt"
+
+        docker network create main
+        cd ${TRAVIS_BUILD_DIR}/ci
+
+        docker-compose up -d
+        cd ..
+
+        # Wait until idm is ready
+        test_connection 'KeyRock' http://localhost:3000
 fi
 
 echo "travis-build.bash is done."

ci/docker-compose.yml

@@ -0,0 +1,29 @@
+version: "2"
+networks:
+   main:
+    external: true
+
+services:
+    mysql:
+      image: mysql:5.7
+      networks:
+        main:
+          aliases:
+            - mysql.idm.docker
+      environment:
+        - MYSQL_ROOT_PASSWORD=idm
+
+    fiware-idm:
+      image: fiware/idm:7.6.0
+      ports:
+        - "3000:3000"
+        - "443:443"
+      networks:
+        main:
+         aliases:
+           - idm.docker
+      #volumes:
+      #  - /etc/ssl/self_signed.key:/opt/fiware-idm/certs/self_signed.key:ro
+      #  - /usr/local/share/ca-certificates/self_signed.crt:/opt/fiware-idm/certs/self_signed.crt:ro
+      environment:
+        - IDM_DB_HOST=mysql.idm.docker

ckanext/oauth2/tests/test_oauth2.py

@@ -241,7 +241,7 @@ def test_get_token_insecure_enabled(self):
     def test_get_token_error(self):
         helper = self._helper()
         token = {
-            'error': 'auth_error',
+            'info': 'auth_error',
             'error_description': 'Some description'
         }
         httpretty.register_uri(httpretty.POST, helper.token_endpoint, body=json.dumps(token))

ckanext/oauth2/tests/test_selenium.py

@@ -34,7 +34,7 @@
 from selenium.webdriver.support.ui import WebDriverWait
 
 
-IDM_URL = "https://localhost"
+IDM_URL = "http://localhost:3000"
 FILAB2_MAIL = "[email protected]"
 FILAB_PASSWORD = "1234"
 PASS_INTEGRATION_TESTS = os.environ.get("INTEGRATION_TEST", "").strip().lower() in ('1', 'true', 'on')
@@ -58,6 +58,7 @@ def setUpClass(cls):
         }
         url = urljoin(IDM_URL, AUTH_TOKEN_ENDPOINT)
         response = requests.post(url, json=body)
+        print(response.text)
 
         token = response.headers["X-Subject-Token"]
 

test-fiware.ini

@@ -32,21 +32,22 @@ ckan.tests.functional.test_cache.TestCacheBasics.test_get_cache_expires.expires
 ckan.plugins = oauth2
 
 ## OAuth2 configuration
-ckan.oauth2.register_url = https://localhost/sign_up
-ckan.oauth2.reset_url = https://localhost/password/request
-ckan.oauth2.edit_url = https://localhost/idm/settings
-ckan.oauth2.authorization_endpoint = https://localhost/oauth2/authorize
-ckan.oauth2.token_endpoint = https://localhost/oauth2/token
-ckan.oauth2.profile_api_url = https://localhost/user
+ckan.oauth2.register_url = http://localhost:3000/sign_up
+ckan.oauth2.reset_url = http://localhost:3000/password/request
+ckan.oauth2.edit_url = http://localhost:3000/idm/settings
+ckan.oauth2.authorization_endpoint = http://localhost:3000/oauth2/authorize
+ckan.oauth2.token_endpoint = http://localhost:3000/oauth2/token
+ckan.oauth2.profile_api_url = http://localhost:3000/user
+ckan.oauth2.is_legacy = true
 # The following parameters are configured through environment variables
 #ckan.oauth2.client_id = 361020fd7cf64456890dd98da88e64f3
 #ckan.oauth2.client_secret = edf713bf8a2344139f46a757fadae24f
 ckan.oauth2.scope = all_info
 ckan.oauth2.rememberer_name = auth_tkt
-ckan.oauth2.profile_api_user_field = id
-ckan.oauth2.profile_api_fullname_field = displayName
+ckan.oauth2.profile_api_user_field = username
+ckan.oauth2.profile_api_fullname_field = username
 ckan.oauth2.profile_api_mail_field = email
-ckan.oauth2.authorization_header = X-Auth-Token
+ckan.oauth2.authorization_header = Bearer
 
 
 #who.config_file = %(here)s/who-fiware.ini