Add tests for email address passed to create wall

mozilla · Mar 19, 2013 · b201c46 · b201c46
1 parent 226a2de
commit b201c46
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/wall/lib/walls.inc b/wall/lib/walls.inc
@@ -583,7 +583,8 @@ class Wall {
                   'wallUrl', 'wallShortUrl',
                   'editorUrl', 'editorShortUrl',
                   'duration', 'defaultDuration',
-                  'passcodeLen', 'latestSession');
+                  'ownerEmail', 'passcodeLen',
+                  'latestSession');
 
     $result = array();
     foreach ($keys as $localKey => $keyToExport) {
@@ -809,7 +810,7 @@ class Walls {
       . ' ,eventName, eventDescr, eventLocation, eventType, eventFinish'
       . ' ,urlPath, shortUrl, editorShortUrl'
       . ' ,walls.duration, galleryDisplay, passcode'
-      . ' ,designs.duration AS defaultduration'
+      . ' ,designs.duration AS defaultDuration'
       . ' ,users.email AS ownerEmail'
       . ' ,sessionId, beginDate as sessionStart, endDate as sessionEnd'
       . ' FROM walls'

diff --git a/wall/tests/api/TestCreateWall.php b/wall/tests/api/TestCreateWall.php
@@ -118,9 +118,19 @@ function testUrl() {
   }
 
   function testEmail() {
-    // Test a bad email is rejected
-    // Test the ownerEmail returned is set to the email we passed in (after 
-    // trimming)
+    $this->login();
+
+    // Test the ownerEmail returned is set to the email we passed in
+    $wall = $this->_createWall('Test wall', $this->testDesignId);
+    $this->assertEqual(@$wall['ownerEmail'], $this->userEmail);
+    $this->removeWall($wall['wallId']);
+
+    // Try a bad email
+    $this->logout();
+    $this->userEmail = 'abc';
+    $this->login();
+    $wall = $this->_createWall('Test wall', $this->testDesignId);
+    $this->assertEqual(@$wall['error_key'], 'bad-email');
   }
 
   function testDesignId() {

diff --git a/wall/tests/api/WallMakerTestCase.php b/wall/tests/api/WallMakerTestCase.php
@@ -61,7 +61,7 @@ function login() {
                                // cache limiting headers
     session_start();
 
-    $_SESSION['email'] = 'test@test.org';
+    $_SESSION['email'] = $this->userEmail;
 
     // We're about to call into the wall server which will want to access the 
     // same session but session files are opened exclusively so we store the