Explorar o código

modified 01-driver-live.t to support the new calling method

Gordon Child %!s(int64=14) %!d(string=hai) anos
pai
achega
e65e6d1ea7
Modificáronse 1 ficheiros con 35 adicións e 38 borrados
  1. 35 38
      t/01-driver-live.t

+ 35 - 38
t/01-driver-live.t

@@ -37,52 +37,52 @@ CHECK_DRIVER: {
                 ok($driver->isa('Selenium::Remote::Driver'), '...and of right type');
                 ok(defined $driver->{'session_id'}, 'Established session on remote server');
                 $ret = $driver->get_capabilities;
-                is($ret->{'cmd_return'}->{'browserName'}, 'firefox', 'Right capabilities');
+                is($ret->{'browserName'}, 'firefox', 'Right capabilities');
               }
 
 LOAD_PAGE: {
-                $ret = $driver->get("$website/index.html");
-                is($ret->{'cmd_status'}, 'OK', 'Loaded home page');
+                $driver->get("$website/index.html");
+                pass('Loaded home page');
                 $ret = $driver->get_title();
-                is($ret->{'cmd_return'}, 'Hello WebDriver', 'Got the title');
+                is($ret, 'Hello WebDriver', 'Got the title');
                 $ret = $driver->get_current_url();
-                ok($ret->{'cmd_return'} =~ m/$website/i, 'Got proper URL');
+                ok($ret =~ m/$website/i, 'Got proper URL');
            }
 
 WINDOW: {
             $ret = $driver->get_current_window_handle();
-            ok($ret->{'cmd_return'} =~ m/^{.*}$/, 'Proper window handle received');
+            ok($ret =~ m/^{.*}$/, 'Proper window handle received');
             $ret = $driver->get_window_handles();
-            is(ref $ret->{'cmd_return'}, 'ARRAY', 'Received all window handles');
+            is(ref $ret, 'ARRAY', 'Received all window handles');
             $ret = $driver->get_page_source();
-            ok($ret->{'cmd_return'} =~ m/^<html/i, 'Received page source');
-            $ret = $driver->get_speed();
-            ok($ret->{'cmd_return'} =~ m/[SLOW|MEDIUM|FAST]/i, 'Got speed...');
-            $ret = $driver->set_speed('FAST');
-            is($ret->{'cmd_status'}, 'OK', 'Setting speed to FAST...');
-            $ret = $driver->get_speed();
-            is($ret->{'cmd_return'}, 'FAST', '...confirmed set_speed()');
+            ok($ret =~ m/^<html/i, 'Received page source');
+            #$ret = $driver->get_speed();
+            #ok($ret =~ m/[SLOW|MEDIUM|FAST]/i, 'Got speed...');
+            #$ret = $driver->set_speed('FAST');
+            #is($ret, 'OK', 'Setting speed to FAST...');
+            #$ret = $driver->get_speed();
+            #is($ret, 'FAST', '...confirmed set_speed()');
             $ret = $driver->get("$website/frameset.html");
             $ret = $driver->switch_to_frame('second');
-            is($ret->{'cmd_status'}, 'OK', 'Setting speed to FAST...');
+            pass('Setting speed to FAST...');
         }
 
 COOKIES: {
             $driver->get("$website/cookies.html");
             $ret = $driver->get_all_cookies();
-            is(@{$ret->{'cmd_return'}}, 2, 'Got 2 cookies');
+            is(@{$ret}, 2, 'Got 2 cookies');
             $ret = $driver->delete_all_cookies();
-            is($ret->{'cmd_status'}, 'OK', 'Deleting cookies...');
+            pass('Deleting cookies...');
             $ret = $driver->get_all_cookies();
-            is(@{$ret->{'cmd_return'}}, 0, 'Deleted all cookies.');
+            is(@{$ret}, 0, 'Deleted all cookies.');
             $ret = $driver->add_cookie('foo', 'bar', '/', 'localhost', 0);
-            is($ret->{'cmd_status'}, 'OK', 'Adding cookie foo...');
+            pass('Adding cookie foo...');
             $ret = $driver->get_all_cookies();
-            is(@{$ret->{'cmd_return'}}, 1, 'foo cookie added.');
+            is(@{$ret}, 1, 'foo cookie added.');
             $ret = $driver->delete_cookie_named('foo');
-            is($ret->{'cmd_status'}, 'OK', 'Deleting cookie foo...');
+            pass('Deleting cookie foo...');
             $ret = $driver->get_all_cookies();
-            is(@{$ret->{'cmd_return'}}, 0, 'foo cookie deleted.');
+            is(@{$ret}, 0, 'foo cookie deleted.');
             $ret = $driver->delete_all_cookies();
          }
 
@@ -90,37 +90,34 @@ MOVE: {
         $driver->get("$website/index.html");
         $driver->get("$website/formPage.html");
         $ret = $driver->go_back();
-        is($ret->{'cmd_status'}, 'OK', 'Clicked Back...');
+        pass('Clicked Back...');
         $ret = $driver->get_title();
-        is($ret->{'cmd_return'}, 'Hello WebDriver', 'Got the right title');
+        is($ret, 'Hello WebDriver', 'Got the right title');
         $ret = $driver->go_forward();
-        is($ret->{'cmd_status'}, 'OK', 'Clicked Forward...');
+        pass('Clicked Forward...');
         $ret = $driver->get_title();
-        is($ret->{'cmd_return'}, 'We Leave From Here', 'Got the right title');
+        is($ret, 'We Leave From Here', 'Got the right title');
         $ret = $driver->refresh();
-        is($ret->{'cmd_status'}, 'OK', 'Clicked Refresh...');
+        pass('Clicked Refresh...');
         $ret = $driver->get_title();
-        is($ret->{'cmd_return'}, 'We Leave From Here', 'Got the right title');
+        is($ret, 'We Leave From Here', 'Got the right title');
       }
 
 FIND: {
-        $ret = $driver->find_element("//input[\@id='checky']");
-        my $elem = $ret->{'cmd_return'};
+        my $elem = $driver->find_element("//input[\@id='checky']");
         ok($elem->isa('Selenium::Remote::WebElement'), 'Got WebElement via Xpath');
-        $ret = $driver->find_element('checky', 'id');
-        $elem = $ret->{'cmd_return'};
+        $elem = $driver->find_element('checky', 'id');
         ok($elem->isa('Selenium::Remote::WebElement'), 'Got WebElement via Id');
-        $ret = $driver->find_element('checky', 'name');
-        $elem = $ret->{'cmd_return'};
+        $elem = $driver->find_element('checky', 'name');
         ok($elem->isa('Selenium::Remote::WebElement'), 'Got WebElement via Name');
         
-        $elem = ($driver->find_element('multi', 'id'))->{'cmd_return'};
-        $ret = $driver->find_child_element($elem, "/option");
+        $elem = $driver->find_element('multi', 'id');
+        $elem = $driver->find_child_element($elem, "option");
         ok($elem->isa('Selenium::Remote::WebElement'), 'Got child WebElement...');
         $ret = $elem->get_value();
-        is($ret->{'cmd_return'}, 'Eggs', '...right child WebElement');
+        is($ret, 'Eggs', '...right child WebElement');
         $ret = $driver->find_child_elements($elem, "//option[\@selected='selected']");
-        is(@{$ret->{'cmd_return'}}, 4, 'Got 4 WebElements');
+        is(@{$ret}, 4, 'Got 4 WebElements');
       }