Changeset 1642

Timestamp:

02/26/10 10:15:13 (5 months ago)

Author:

klemens

Message:

Fixed ullTime functional tests

Location:

trunk/test/functional/frontend/ullTimePlugin

Files:

• ullTimeBasicAsUserTest.php (modified) (1 diff)
• ullTimeWeekSumTest.php (modified) (4 diffs)

trunk/test/functional/frontend/ullTimePlugin/ullTimeBasicAsUserTest.php

@@ -58 +58 @@
 ;
 
-// Go back to index, because it's hard to find the right link for today on
-// the period overview page
 $b
-  ->diag('index: go to Project timereporting for today')
-//  ->get('ullTime/index')
-  // check if on overview 
-  // click project effort
-  ->click('Project timereporting for today')
+  ->diag('enter project efforts for today')
+  // TODO: check if on overview 
+  // We assume, that the first link is for "today"
+  ->click('Project reporting')
   ->isStatusCode(200)
   ->with('request')->begin()

trunk/test/functional/frontend/ullTimePlugin/ullTimeWeekSumTest.php

@@ -12 +12 @@
 
 // TODO: rename to PeriodOverviewTest
-// TODO: manual fixtures
+// TODO: use manual fixtures
 
 /*
@@ -34 +34 @@
 $b
   ->diag('index: go to Timereporting for 2009-10-27')
-  ->get('ullTime/create/username/admin/date/2009-10-27')
+  ->get('ullTime/create/date/2009-10-27')
   ->isStatusCode(200)
   ->with('request')->begin()
     ->isParameter('module', 'ullTime')
     ->isParameter('action', 'create')
+    ->isParameter('date', '2009-10-27')
   ->end()
 ;
@@ -49 +50 @@
   ->isRedirected()
   ->followRedirect()
-  // TODO: Remove
-  ->with('request')->begin()
-    ->isParameter('module', 'ullTime')
-    ->isParameter('action', 'list')
-  ->end()
 ;
 
 $b
   ->diag('list: check correct working time')
+  // call the period manually because we don't have a referer
+  ->get('ullTime/list/period/october-2009')
+  ->with('request')->begin()
+    ->isParameter('module', 'ullTime')
+    ->isParameter('action', 'list')
+    ->isParameter('period', 'october-2009')
+  ->end()  
   ->with('response')->begin()
     ->checkElement($dgsList->get(5, 'time_total'), '5:00')
   ->end()
 ;
+
 
 $b
@@ -75 +79 @@
 $b
   ->diag('create: enter two new project efforts')
-  ->setField('fields[ull_project_id]', Doctrine::getTable('UllProject')->findBySlug('introduce-ullright')->id)
+  ->setField('fields[ull_project_id]', Doctrine::getTable('UllProject')->findOneBySlug('introduce-ullright')->id)
   ->setField('fields[duration_seconds]','1:45')
   ->click('Save and create another entry')
+  
   ->isRedirected()
   ->followRedirect()