Browse Source

Re-put the mock libraries with the driver code, since it can be used elsewhere apart from S::R::D

Emmanuel Peroumalnaik 11 năm trước cách đây
mục cha
commit
f90dfb9ca9

+ 1 - 1
t/lib/MockCommands.pm → lib/Selenium/Remote/Mock/Commands.pm

@@ -1,4 +1,4 @@
-package MockCommands; 
+package Selenium::Remote::Mock::Commands; 
 use Moo; 
 extends 'Selenium::Remote::Commands';
 

+ 1 - 4
t/lib/MockRemoteConnection.pm → lib/Selenium/Remote/Mock/RemoteConnection.pm

@@ -1,4 +1,4 @@
-package MockRemoteConnection;
+package Selenium::Remote::Mock::RemoteConnection;
 
 # ABSTRACT: utility class to mock the responses from Selenium server
 
@@ -6,8 +6,6 @@ use Moo;
 use JSON; 
 use Carp;
 use Try::Tiny;
-# use lib 't/lib';
-# use MockCommands;
 
 extends 'Selenium::Remote::RemoteConnection';
 
@@ -18,7 +16,6 @@ has 'spec' => (
 
 has 'mock_cmds' => ( 
     is => 'ro', 
-    # default => sub { return MockCommands->new }
 );
 
 has 'fake_session_id' => ( 

+ 4 - 5
t/01-driver.t

@@ -9,9 +9,8 @@ use LWP::Protocol::PSGI;
 use LWP::UserAgent;
 use Test::LWP::UserAgent;
 use Selenium::Remote::Driver;
-use lib 't/lib';
-use MockCommands; 
-use MockRemoteConnection;
+use Selenium::Remote::Mock::Commands; 
+use Selenium::Remote::Mock::RemoteConnection; 
 
 BEGIN {
     if (defined $ENV{'WD_MOCKING_RECORD'} && ($ENV{'WD_MOCKING_RECORD'}==1)) {
@@ -405,12 +404,12 @@ BASE_URL: {
         url      => 'http://blog.example.com/foo',
         expected => 'http://blog.example.com/foo',
     });
-    my $mock_commands = MockCommands->new;
+    my $mock_commands = Selenium::Remote::Mock::Commands->new;
     for my $test (@tests) {
         my $base_url_driver = MySeleniumRemoteDriver->new(
             browser_name => 'firefox',
             base_url     => $test->{base_url},
-            remote_conn => MockRemoteConnection->new(spec => {}, mock_cmds => $mock_commands),
+            remote_conn => Selenium::Remote::Mock::RemoteConnection->new(spec => {}, mock_cmds => $mock_commands),
             commands => $mock_commands,
         );
         my $got = $base_url_driver->get($test->{url});

+ 4 - 5
t/Test-Selenium-Remote-Driver.t

@@ -1,11 +1,10 @@
 #!/usr/bin/env perl
-use lib 't/lib';
 use Test::More;
 use Test::Exception;
 use Test::Selenium::Remote::Driver;
 use Selenium::Remote::WebElement;
-use MockCommands;
-use MockRemoteConnection;
+use Selenium::Remote::Mock::Commands;
+use Selenium::Remote::Mock::RemoteConnection;
 
 my $spec = {
     findElement => sub {
@@ -16,11 +15,11 @@ my $spec = {
     },
     getPageSource => sub { return 'this output matches regex'},
 };
-my $mock_commands = MockCommands->new;
+my $mock_commands = Selenium::Remote::Mock::Commands->new;
 
 my $successful_driver =
   Test::Selenium::Remote::Driver->new(
-    remote_conn => MockRemoteConnection->new( spec => $spec, mock_cmds => $mock_commands ),
+    remote_conn => Selenium::Remote::Mock::RemoteConnection->new( spec => $spec, mock_cmds => $mock_commands ),
     commands => $mock_commands,
 );
 $successful_driver->find_element_ok('q','find_element_ok works');

+ 4 - 5
t/Test-Selenium-Remote-WebElement.t

@@ -1,13 +1,12 @@
 #!perl
-use lib 't/lib';
 use Test::More;
-use MockCommands;
-use MockRemoteConnection;
+use Selenium::Remote::Mock::Commands;
+use Selenium::Remote::Mock::RemoteConnection;
 use Test::Selenium::Remote::Driver;
 use Test::Selenium::Remote::WebElement;
 
 # Start off by faking a bunch of Selenium::Remote::WebElement calls succeeding
-my $mock_commands = MockCommands->new;
+my $mock_commands = Selenium::Remote::Mock::Commands->new;
 my $spec = { };
 
 foreach my $k (
@@ -23,7 +22,7 @@ $spec->{getElementAttribute}  = sub { my @args = @_; my $name = $args[0]->{name}
 
 my $driver =
   Test::Selenium::Remote::Driver->new(
-    remote_conn => MockRemoteConnection->new( spec => $spec, mock_cmds => $mock_commands ),
+    remote_conn => Selenium::Remote::Mock::RemoteConnection->new( spec => $spec, mock_cmds => $mock_commands ),
     commands => $mock_commands,
 );