[test] Finishing up the functional test for admin menu reordering.

Author: weaverryan

config/ioDoctrineMenuPluginConfiguration.class.php

@@ -87,6 +87,7 @@ public function loadRoutes(sfEvent $event)
       array(
         'module'  => 'io_doctrine_menu',
         'action'  => 'json',
+        'sf_format' => 'json',
       ),
       array(
         'sf_method' => array('get'),

test/fixtures/project/lib/test/unitHelper.php

@@ -239,4 +239,37 @@ function check_child_ordering(lime_test $t, ioDoctrineMenuItem $rt, $path, array
   }
 
   $t->is($childNameArray, $ordering, 'The children are ordered correctly: '. implode(',', $childNameArray));
+}
+
+// returns an array that closely mimics what's posted from the Nested Sortable widget
+// $arr is the return value from create_doctrine_test_tree()
+function get_nested_set_save_array(array $arr)
+{
+  extract($arr);
+
+  $arr = array(
+    array(
+      'id' => $pt2->id,
+      'children' => array(
+        array(
+          'id' => $ch4->id,
+          'children' => array(
+            array('id' => $gc1->id),
+          )
+        ),
+      )
+    ),
+    array(
+      'id' => $pt1->id,
+      'children' => array(
+        array('id' => $ch3->id),
+        array('id' => $ch1->id),
+        array('id' => $ch2->id),
+      )
+    )
+  );
+
+  return array(
+    'items' => $arr
+  );
 }

test/functional/reorderingTest.php

@@ -31,5 +31,46 @@
   ->with('response')->begin()
     ->isStatusCode(200)
     ->checkElement('h1', '/Reorder Menu "Root li"/')
+    ->info('  1.3 - check for the correct nested set javascript urls')
+    ->matches('/loadUrl:\ \'\/index\.php\/test\/menu\/reorder\/json\/'.$rt->id.'/')
+    ->matches('/saveUrl:\ \'\/index\.php\/test\/menu\/reorder\/save\/'.$rt->id.'/')
   ->end()
 ;
+
+$browser->info('2 - Check out the json response for the menu')
+  ->get('/test/menu/reorder/json/'.$rt->id)
+
+  ->with('request')->begin()
+    ->isParameter('module', 'io_doctrine_menu')
+    ->isParameter('action', 'json')
+    ->isParameter('sf_format', 'json')
+  ->end()
+
+  ->with('response')->begin()
+    ->isStatusCode(200)
+  ->end()
+;
+$response = $browser->getResponse()->getContent();
+$json = json_decode($response);
+$browser->test()->isnt($json, null, 'The response returns a valid json object');
+
+$browser->info('3 - Test the save method')
+  ->call('/test/menu/reorder/save/'.$rt->id, 'post', array(
+    'nested-sortable-widget' => get_nested_set_save_array($arr)
+  ))
+
+  ->with('request')->begin()
+    ->isParameter('module', 'io_doctrine_menu')
+    ->isParameter('action', 'saveJson')
+  ->end()
+
+  ->with('response')->begin()
+    ->isStatusCode(200)
+  ->end()
+;
+
+$browser->info('  3.1 - Check the menu to see that it was updated');
+root_sanity_check($browser->test(), $rt);
+check_child_ordering($browser->test(), $rt, array(), array('Parent 2', 'Parent 1'));
+check_child_ordering($browser->test(), $rt, array(0), array('Child 4'));
+check_child_ordering($browser->test(), $rt, array(1), array('Child 3', 'Child 1', 'Child 2'));

test/unit/model/doctrine/PluginioDoctrineMenuItemTableTest.php

@@ -77,29 +77,11 @@
 
 $t->info('6 - Test restoreTreeFromNestedArray()');
   $tbl->createQuery()->delete()->execute();
-  extract(create_doctrine_test_tree($t));
+  $arr = create_doctrine_test_tree($t);
+  extract($arr);
 
-  $newOrder = array(
-    array(
-      'id' => $pt2->id,
-      'children' => array(
-        array(
-          'id' => $ch4->id,
-          'children' => array(
-            array('id' => $gc1->id),
-          )
-        ),
-      )
-    ),
-    array(
-      'id' => $pt1->id,
-      'children' => array(
-        array('id' => $ch3->id),
-        array('id' => $ch1->id),
-        array('id' => $ch2->id),
-      )
-    )
-  );
+  $newOrder = get_nested_set_save_array($arr);
+  $newOrder = $newOrder['items'];
 
   $tbl->restoreTreeFromNestedArray($newOrder, $rt);
   root_sanity_check($t, $rt);