Small fixes to D6, still errors

cliftonc · Mar 28, 2011 · f952347 · f952347
1 parent 8713f9b
commit f952347
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 41 deletions.
diff --git a/features.d6/example.feature b/features.d6/example.feature
@@ -12,7 +12,7 @@ Feature: I can see my content
 
   Scenario: Can view content
     Given that I am an anonymous user    
-    When I look at the "My Example Content" node
+    When I look at the "node/1" node
     Then I should see "Not this content" in the content
 
   @blog

diff --git a/features.d6/steps/example_steps.php b/features.d6/steps/example_steps.php
@@ -10,62 +10,35 @@
 });
 
 $steps->Then('/^I should see "([^"]*)" in the menu$/', function($world, $title) {    	
-	$found = false;	
-	foreach ($world->menu as $menuitem) {
-		if($menuitem['link']['title'] == $title) $found = true;    
-	}	
-	if(!$found) {
-	   throw new \Behat\Behat\Exception\Exception();
-	}
+    if(!bdd_drupal_is_in_menu($title,$world->menu)) {
+       throw new \Behat\Behat\Exception\Exception();
+    }
 });
 
 $steps->When('/^I look at the "([^"]*)" node$/', function($world, $node) {
-	$world->node = menu_get_object('node',1,'node/1');	
+    $world->node = bdd_drupal_get_path_content($node);        
 });
 
-$steps->Then('/^I should see "([^"]*)" in the content$/', function($world, $contents) {	
-	if($world->node->body != $contents) {
-	   throw new \Behat\Behat\Exception\Exception();	
-	}    
+$steps->Then('/^I should see "([^"]*)" in the content$/', function($world, $text) {	
+	if(bdd_drupal_contains($world->node,$text) == false) {
+       throw new \Behat\Behat\Exception\Exception();    
+    }    
 });
 
 $steps->Given('/^that I am a logged in user$/', function($world) {
     bdd_drupal_set_user(BDD_DRUPAL_ADMIN);	
 });
 
 $steps->When('/^I look at my blog$/', function($world) {    
-
-    $module = menu_get_item('blog/1');
 
-    // print_r($module);
-    // Wrap into helper    
-    $module_func = $module['page_callback'];
-    $module_arg = $module['page_arguments'][0];
-
-    print_r("HERE");
-
-    require_once $module['file'];               
-
-
-    print_r("HERE");
-
-
-    $result = $module_func($module_arg);        
-
-    print_r("HERE");
-
-    // $world->blog = $result;            
+	$world->blog = bdd_drupal_get_path_content('blog/1');                
 
 });
 
 $steps->Then('/^I should see "([^"]*)" the content$/', function($world, $text) {
 
-	if(is_string($world->blog)) {
-	   if(strpos($world->blog,$text) === false){
+    if(bdd_drupal_contains($world->blog,$text) == false){         
          throw new \Behat\Behat\Exception\Exception();
-        }
-	} else {
-		 throw new \Behat\Behat\Exception\Exception();
-	}
+    }
 
 });
diff --git a/features.d6/support/drupal-6.helpers.php b/features.d6/support/drupal-6.helpers.php
@@ -56,7 +56,9 @@ function bdd_drupal_get_node_at_path($path) {
 function bdd_drupal_get_path_content($path) {
 
 	$returnValue = "";
+
 	$item = menu_get_item($path);	
+
     $callback = $item['page_callback'];   
 
     if($callback) {
@@ -70,8 +72,8 @@ function bdd_drupal_get_path_content($path) {
         }                   
 
         // Call callback
-        $result = $callback($callback_arg);   // Check D7 code                    
-        print("RESULT: " . $result);
+        $result = $callback($callback_arg);   // Check D7 code
+
         $returnValue = $result;
 
     }