Merge lp:~canonical-isd-hackers/drupal-launchpad/6.x-sso into lp:drupal-launchpad/6.x

[Szilveszter Farkas]

This branch contains several updates:

1) Ubuntu SSO endpoints added.

2) Test coverage increased from 21.16% to 39.73%

3) Added notes about testing and code coverage measurement.

[lp:~canonical-isd-hackers/drupal-launchpad/6.x-sso]

32. By Szilveszter Farkas on 2010-04-30

Fix define which can break the whole site.

[Anthony Lenton (elachuni)]

Looks good in general. Approved, pending a fix in the tests to put back persistent variables the way they were before running the tests.

review: Approve

[Szilveszter Farkas (phanatic)]

We figured out that the tests use separate database tables, so setting the variables in the tests shouldn't affect production settings.

=== added file 'TESTING.txt'
--- TESTING.txt	1970-01-01 00:00:00 +0000
+++ TESTING.txt	2010-04-30 16:08:58 +0000
@@ -0,0 +1,22 @@
+How to run drupal-launchpad unit tests?
+=======================================
+
+You'll need the SimpleTest plugin for Drupal 6, available from here:
+
+http://drupal.org/project/simpletest
+
+After applying the appropriate patches to Drupal core, and enabling the 
+SimpleTest module, you'll be able to find the tests in the Administration
+interface under Site building / Testing.
+
+
+How to measure code coverage?
+=============================
+
+Grab the Drupal 6 compatible code_coverage module this branch:
+
+https://code.edge.launchpad.net/~canonical-isd-hackers/drupal-launchpad/6.x-code_coverage
+
+After applying the two patches to Drupal core and SimpleTest, and finally
+enabling the Code coverage module, you'll find the reports after each test run
+under the Code coverage main menu item.

=== modified file 'openid_launchpad.module'
--- openid_launchpad.module	2009-03-27 11:13:33 +0000
+++ openid_launchpad.module	2010-04-30 16:08:58 +0000
@@ -26,6 +26,10 @@
 define('LAUNCHPAD_TESTING_OP', LAUNCHPAD_TESTING_URL.'+openid');
 define('LAUNCHPAD_STAGING_URL', 'https://login.staging.launchpad.net/');
 define('LAUNCHPAD_STAGING_OP', LAUNCHPAD_STAGING_URL.'+openid');
+define('UBUNTU_SSO_PRODUCTION_URL', 'https://login.ubuntu.com/');
+define('UBUNTU_SSO_PRODUCTION_OP', UBUNTU_SSO_PRODUCTION_URL.'+openid');
+define('UBUNTU_SSO_STAGING_URL', 'https://login.staging.ubuntu.com/');
+define('UBUNTU_SSO_STAGING_OP', UBUNTU_SSO_STAGING_URL.'+openid');
 
 /**
  * Implementation of hook_menu.
@@ -335,7 +339,9 @@
 function get_expected_endpoint() {
   $endpoints = array (LAUNCHPAD_PRODUCTION_URL => LAUNCHPAD_PRODUCTION_OP,
                       LAUNCHPAD_TESTING_URL => LAUNCHPAD_TESTING_OP,
-                      LAUNCHPAD_STAGING_URL => LAUNCHPAD_STAGING_OP);
+                      LAUNCHPAD_STAGING_URL => LAUNCHPAD_STAGING_OP,
+                      UBUNTU_SSO_PRODUCTION_URL => UBUNTU_SSO_PRODUCTION_OP,
+                      UBUNTU_SSO_STAGING_URL => UBUNTU_SSO_STAGING_OP);
   $current_server = variable_get('openid_launchpad_server', LAUNCHPAD_PRODUCTION_URL);
   return $endpoints[$current_server];
 }
@@ -414,9 +420,11 @@
       '#type'    => 'radios',
       '#title'   => t('Select server'),
       '#options' => array(
-        LAUNCHPAD_PRODUCTION_URL => t('Production') . " (" . LAUNCHPAD_PRODUCTION_URL . ")",
-        LAUNCHPAD_STAGING_URL    => t('Staging') . " (" . LAUNCHPAD_STAGING_URL . ")",
-        LAUNCHPAD_TESTING_URL    => t('Testing') . " (" . LAUNCHPAD_TESTING_URL . ")",
+        LAUNCHPAD_PRODUCTION_URL  => t('Production') . " (" . LAUNCHPAD_PRODUCTION_URL . ")",
+        LAUNCHPAD_STAGING_URL     => t('Staging') . " (" . LAUNCHPAD_STAGING_URL . ")",
+        LAUNCHPAD_TESTING_URL     => t('Testing') . " (" . LAUNCHPAD_TESTING_URL . ")",
+        UBUNTU_SSO_PRODUCTION_URL => t('Ubuntu SSO production') . " (" . UBUNTU_SSO_PRODUCTION_URL . ")",
+        UBUNTU_SSO_STAGING_URL    => t('Ubuntu SSO staging') . " (" . UBUNTU_SSO_STAGING_URL . ")",
       ),
       '#default_value' => variable_get('openid_launchpad_server', LAUNCHPAD_PRODUCTION_URL),
     );

=== modified file 'tests/module.test'
--- tests/module.test	2009-03-03 01:20:23 +0000
+++ tests/module.test	2010-04-30 16:08:58 +0000
@@ -43,6 +43,11 @@
     $this->assertFalse($result);
   }
 
+  function testDrupalLaunchpadNotAllowPasswordPageAccess() {
+    $result = allow_password_page_access();
+    $this->assertFalse($result);
+  }
+
   function testDrupalLaunchpadHideUserAccountPagesWhenOptionNotSet() {
     variable_del('openid_launchpad_hide_account');
     $result = hide_user_account_pages();
@@ -67,6 +72,16 @@
     $this->assertFalse($result);
   }
 
+  function testDrupalLaunchpadAllowLoginPageAccess() {
+    $result = allow_login_page_access();
+    $this->assertTrue($result);
+  }
+
+  function testDrupalLaunchpadAllowRegisterPageAccess() {
+    $result = allow_register_page_access();
+    $this->assertFalse($result);
+  }
+
   function testDrupalLaunchpadDetectNonOpenIDResponse() {
     unset($_SESSION['openid']);
     $result = allow_non_login_page_access();
@@ -135,9 +150,45 @@
     $result = get_expected_endpoint();
     $this->assertEqual($result, LAUNCHPAD_STAGING_OP);
 
+    variable_set('openid_launchpad_server', UBUNTU_SSO_PRODUCTION_URL);
+    $result = get_expected_endpoint();
+    $this->assertEqual($result, UBUNTU_SSO_PRODUCTION_OP);
+
+    variable_set('openid_launchpad_server', UBUNTU_SSO_STAGING_URL);
+    $result = get_expected_endpoint();
+    $this->assertEqual($result, UBUNTU_SSO_STAGING_OP);
+
     variable_del('openid_launchpad_server');
   }
 
+  function testDrupalLaunchpadAdminOverviewForm() {
+    variable_set('openid_launchpad_hide_account', true);
+    variable_set('openid_launchpad_sync_user', true);
+    variable_set('openid_launchpad_prevent_register', true);
+
+    $form = launchpad_admin_overview();
+    $this->assertEqual($form['#submit'], array('launchpad_admin_overview_submit'));
+    $this->assertEqual($form['trust_root']['#type'], 'markup');
+    $this->assertTrue(strpos($form['trust_root']['#value'], 'This site\'s trust root/realm is:'));
+    $this->assertEqual($form['openid_launchpad_server']['#type'], 'radios');
+    $this->assertEqual($form['openid_launchpad_server']['#options'][LAUNCHPAD_PRODUCTION_URL], 'Production (https://login.launchpad.net/)');
+    $this->assertEqual($form['openid_launchpad_server']['#options'][LAUNCHPAD_STAGING_URL], 'Staging (https://login.staging.launchpad.net/)');
+    $this->assertEqual($form['openid_launchpad_server']['#options'][LAUNCHPAD_TESTING_URL], 'Testing (https://login.demo.launchpad.net/)');
+    $this->assertEqual($form['openid_launchpad_server']['#options'][UBUNTU_SSO_PRODUCTION_URL], 'Ubuntu SSO production (https://login.ubuntu.com/)');
+    $this->assertEqual($form['openid_launchpad_server']['#options'][UBUNTU_SSO_STAGING_URL], 'Ubuntu SSO staging (https://login.staging.ubuntu.com/)');
+    $this->assertEqual($form['openid_launchpad_server']['#default_value'], 'https://login.launchpad.net/');
+    $this->assertEqual($form['sso']['openid_launchpad_hide_account']['#title'], 'Prevent users from accessing \'My Account\' functionality');
+    $this->assertEqual($form['sso']['openid_launchpad_hide_account']['#default_value'], true);
+    $this->assertEqual($form['sso']['openid_launchpad_sync_user']['#title'], 'Keep users\' name and email in sync with launchpad');
+    $this->assertEqual($form['sso']['openid_launchpad_sync_user']['#default_value'], true);
+    $this->assertEqual($form['sso']['openid_launchpad_prevent_register']['#title'], 'Prevent users from using the registration form');
+    $this->assertEqual($form['sso']['openid_launchpad_prevent_register']['#default_value'], true);
+
+    variable_del('openid_launchpad_hide_account');
+    variable_del('openid_launchpad_sync_user');
+    variable_del('openid_launchpad_prevent_register');
+  }
+
   function testDrupalLaunchpadSavesCorrectOpenIDServerFromAdminForm() {
     $form = array();
     $form_state = array('values' => array('openid_launchpad_server' => ''));