Merge pull request #171 from gempesaw/skip-all-if-mocks-are-missing

.gitignore

@@ -9,3 +9,4 @@ cover_db
 .build
 Selenium-Remote-Driver-*
 .prove
+_prove

t/01-driver.t

@@ -14,11 +14,9 @@ use FindBin;
 use lib $FindBin::Bin . '/lib';
 use TestHarness;
 
-my $harness = TestHarness->new(
+my %selenium_args = %{ TestHarness->new(
     this_file => $FindBin::Script
-);
-my %selenium_args = %{ $harness->base_caps };
-$harness->skip_all_unless_mocks_exist;
+)->base_caps };
 
 my $driver = Selenium::Remote::Driver->new(%selenium_args);
 my $website = 'http://localhost:63636';
@@ -409,9 +407,9 @@ BASE_URL: {
                 spec => {
                     get =>
                       sub { my ( undef, $params ) = @_; return $params->{url} }
-                },
+                  },
                 mock_cmds => $mock_commands
-              ),
+            ),
             commands => $mock_commands,
         );
         my $got = $base_url_driver->get($test->{url});

t/02-webelement.t

@@ -9,11 +9,9 @@ use FindBin;
 use lib $FindBin::Bin . '/lib';
 use TestHarness;
 
-my $harness = TestHarness->new(
+my %selenium_args = %{ TestHarness->new(
     this_file => $FindBin::Script
-);
-my %selenium_args = %{ $harness->base_caps };
-$harness->skip_all_unless_mocks_exist;
+)->base_caps };
 
 my $driver = Selenium::Remote::Driver->new(%selenium_args);
 my $website = 'http://localhost:63636';

t/10-switch-to-window.t

@@ -18,7 +18,6 @@ my %selenium_args = (
     javascript     => 1,
     %{ $harness->base_caps }
 );
-$harness->skip_all_unless_mocks_exist;
 
 plan tests => 9;
 

t/Firefox-Profile.t

@@ -17,11 +17,9 @@ use FindBin;
 use lib $FindBin::Bin . '/lib';
 use TestHarness;
 
-my $harness = TestHarness->new(
+my %selenium_args = %{ TestHarness->new(
     this_file => $FindBin::Script
-);
-my %selenium_args = %{ $harness->base_caps };
-$harness->skip_all_unless_mocks_exist;
+)->base_caps };
 
 my $fixture_dir = $FindBin::Bin . '/www/';
 

t/Test-Selenium-Remote-Driver-google.t

@@ -9,11 +9,9 @@ use FindBin;
 use lib $FindBin::Bin . '/lib';
 use TestHarness;
 
-my $harness = TestHarness->new(
+my %selenium_args = %{ TestHarness->new(
     this_file => $FindBin::Script
-);
-my %selenium_args = %{ $harness->base_caps };
-$harness->skip_all_unless_mocks_exist;
+)->base_caps };
 
 # Try to find
 my $t = Test::Selenium::Remote::Driver->new(

t/error.t

@@ -7,7 +7,6 @@ use Test::Exception;
 use Test::LWP::UserAgent;
 use IO::Socket::INET;
 
-
 BEGIN: {
     unless (use_ok('Selenium::Remote::Driver')) {
         BAIL_OUT("Couldn't load Selenium::Remote::Driver");

t/lib/TestHarness.pm

@@ -8,11 +8,23 @@ use Test::More;
 
 =head1 SYNOPSIS
 
-    my $harness = TestHarness->new(
+    my %selenium_args = %{ TestHarness->new(
         this_file => $FindBin::Script
-    );
-    my %selenium_args = %{ $harness->base_caps };
-    $harness->skip_all_unless_mocks_exist;
+    )->base_caps };
+
+=head1 DESCRIPTION
+
+A setup class for all the repetitive things we need to do before
+running tests. First, we're deciding whether the test is in C<record>
+or C<replay> mode. If we're recording, we'll end up writing all the
+HTTP request/response pairs out to L</mock_file>. If we're replaying,
+we'll look for our OS-appropriate mock_file and try to read from it.
+
+After we figure that out, we can instantiate our
+Mock::RemoteConnection with the proper constructor arguments and
+return that as our base_args for use in the tests! Finally, on
+destruction, if we're recording, we make sure to dump out all of the
+request/response pairs to the mock_file.
 
 =attr this_file
 
@@ -103,28 +115,18 @@ has mock_file => (
         my $test_name = lc($self->calling_file);
         $test_name =~ s/\.t$//;
 
-        return $mock_folder . $test_name . '-mock-' . $self->os . '.json';
-    }
-);
+        my $mock_file = $mock_folder . $test_name . '-mock-' . $self->os . '.json';
 
-sub skip_all_unless_mocks_exist {
-    my ($self) = @_;
-    unless ($self->mocks_exist_for_platform) {
-        plan skip_all => "Mocking of tests is not been enabled for this platform";
-    }
-}
+        # If we're replaying, we need a mock to read from. Otherwise,
+        # we can't do anything
+        if (not $self->record) {
+            plan skip_all => "Mocking of tests is not been enabled for this platform"
+              unless -e $mock_file;
+        }
 
-sub mocks_exist_for_platform {
-    my ($self) = @_;
-    if ($self->record) {
-        return 1;
+        return $mock_file;
     }
-    else {
-        # When we're replaying a test, we need recordings to be able
-        # to do anything
-        return -e $self->mock_file;
-    }
-}
+);
 
 sub DEMOLISH {
     my ($self) = @_;