From f4b2e87098620698bc4acd87fd16d3d28004a697 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aitor=20Mag=C3=A1n=20Garc=C3=ADa?= Date: Wed, 14 Jan 2015 19:42:03 +0100 Subject: [PATCH 1/2] Update FIWARE IdM URL URL has been changed from account.lab.fi-ware.org to account.lab.fiware.org --- test-fiware.ini | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test-fiware.ini b/test-fiware.ini index bdeba35..b80035c 100644 --- a/test-fiware.ini +++ b/test-fiware.ini @@ -33,12 +33,12 @@ ckan.plugins = oauth2 ## OAuth2 configuration ckan.oauth2.logout_url = /user/logged_out -ckan.oauth2.register_url = https://account.lab.fi-ware.org/users/sign_up -ckan.oauth2.reset_url = https://account.lab.fi-ware.org/users/password/new -ckan.oauth2.edit_url = https://account.lab.fi-ware.org/settings -ckan.oauth2.authorization_endpoint = https://account.lab.fi-ware.org/authorize -ckan.oauth2.token_endpoint = https://account.lab.fi-ware.org/token -ckan.oauth2.profile_api_url = https://account.lab.fi-ware.org/user +ckan.oauth2.register_url = https://account.lab.fiware.org/users/sign_up +ckan.oauth2.reset_url = https://account.lab.fiware.org/users/password/new +ckan.oauth2.edit_url = https://account.lab.fiware.org/settings +ckan.oauth2.authorization_endpoint = https://account.lab.fiware.org/authorize +ckan.oauth2.token_endpoint = https://account.lab.fiware.org/token +ckan.oauth2.profile_api_url = https://account.lab.fiware.org/user ckan.oauth2.client_id = 716 ckan.oauth2.client_secret = c70657f6667dcae34c21edb7fc0da36fb25b486d56ec1a5c4fa3c1a642312b7dbf208d83f223c8f5223652c4bb94131504fc3cca0aeb9a9b2d75127e478ceffa ckan.oauth2.scope = @@ -92,4 +92,4 @@ level = NOTSET formatter = generic [formatter_generic] -format = %(asctime)s %(levelname)-5.5s [%(name)s] %(message)s \ No newline at end of file +format = %(asctime)s %(levelname)-5.5s [%(name)s] %(message)s From 732a1134ac61eea6b5dba124f3563cd63ff4d6fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aitor=20Mag=C3=A1n=20Garc=C3=ADa?= Date: Wed, 14 Jan 2015 19:49:29 +0100 Subject: [PATCH 2/2] Update FIWARE IdM URL Tests also need to be changed since they are making some checks using the old URLs --- ckanext/oauth2/tests/test_selenium.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ckanext/oauth2/tests/test_selenium.py b/ckanext/oauth2/tests/test_selenium.py index 208514d..5b0cc88 100644 --- a/ckanext/oauth2/tests/test_selenium.py +++ b/ckanext/oauth2/tests/test_selenium.py @@ -67,7 +67,7 @@ def test_basic_login(self): self.assertEqual(self.base_url + "about", driver.current_url) driver.find_element_by_css_selector("a[title=\"Edit settings\"]").click() time.sleep(3) # Wait the OAuth2 Server to return the page - assert driver.current_url.startswith("https://account.lab.fi-ware.org/settings") + assert driver.current_url.startswith("https://account.lab.fiware.org/settings") def test_basic_login_different_referer(self): driver = self.driver @@ -100,11 +100,11 @@ def test_register_btn(self): driver = self.driver driver.get(self.base_url) driver.find_element_by_link_text("Register").click() - self.assertEqual("https://account.lab.fi-ware.org/users/sign_up", driver.current_url) + self.assertEqual("https://account.lab.fiware.org/users/sign_up", driver.current_url) @parameterized.expand([ - ("user/register", "https://account.lab.fi-ware.org/users/sign_up"), - ("user/reset", "https://account.lab.fi-ware.org/users/password/new") + ("user/register", "https://account.lab.fiware.org/users/sign_up"), + ("user/reset", "https://account.lab.fiware.org/users/password/new") ]) def test_register(self, action, expected_url): driver = self.driver