Pārlūkot izejas kodu

simplified the code of check_ok

Emmanuel Peroumalnaik 11 gadi atpakaļ
vecāks
revīzija
b461bbdddc
1 mainītis faili ar 5 papildinājumiem un 23 dzēšanām
  1. 5 23
      lib/Test/Selenium/Remote/Role/DoesTesting.pm

+ 5 - 23
lib/Test/Selenium/Remote/Role/DoesTesting.pm

@@ -51,37 +51,19 @@ sub _check_ok {
     try {
         $num_of_args = $self->has_args($method);
         @r_args = splice( @args, 0, $num_of_args );
-        if ($method =~ m/^find(_no)?_element/) { 
+        if ($method =~ m/^find(_no|_child)?_element/) { 
             # case find_element_ok was called with no arguments    
-            if (scalar(@r_args) == 1) { 
+            if (scalar(@r_args) - $num_of_args == 1) { 
                 push @r_args, $self->default_finder; 
             }
             else { 
-                if (scalar(@r_args) == 2) { 
+                if (scalar(@r_args) == $num_of_args) {
                     # case find_element was called with no finder but
                     # a test description
-                    my $finder = $r_args[1]; 
+                    my $finder = $r_args[$num_of_args - 1]; 
                     my @FINDERS = keys (%{$self->FINDERS});
                     unless ( any { $finder eq $_ } @FINDERS) { 
-                        $r_args[1] = $self->default_finder; 
-                        push @args, $finder; 
-                    }
-                }
-            }
-        }
-        if ($method =~ m/^find_child_element/) { 
-            # case find_element_ok was called with no arguments    
-            if (scalar(@r_args) == 2) { 
-                push @r_args, $self->default_finder; 
-            }
-            else { 
-                if (scalar(@r_args) == 3) { 
-                    # case find_element was called with no finder but
-                    # a test description
-                    my $finder = $r_args[2]; 
-                    my @FINDERS = keys (%{$self->FINDERS});
-                    unless ( any { $finder eq $_ } @FINDERS) { 
-                        $r_args[2] = $self->default_finder; 
+                        $r_args[$num_of_args - 1] = $self->default_finder; 
                         push @args, $finder; 
                     }
                 }