fixed test for Casper.waitForResource() where a resource is not requested two times consecutively

@@ -597,14 +597,14 @@
         /**
         /**
          * Checks if a given resource was loaded by the remote page.
          * Checks if a given resource was loaded by the remote page.
          *
          *
-         * @param  Function/String  test  A test function or string. In case a string is passed,
+         * @param  Function/String  test  A test function or string. In case a string is passed, url matching will be tested.
          * @return Boolean
          * @return Boolean
          */
          */
         resourceExists: function(test) {
         resourceExists: function(test) {
             var testFn;
             var testFn;
             if (isType(test, "string")) {
             if (isType(test, "string")) {
                 testFn = function (res) {
                 testFn = function (res) {
-                    return res.url.match(test);
+                    return res.url.search(test) !== -1;
                 };
                 };
             } else {
             } else {
               testFn = test;
               testFn = test;
@@ -670,7 +670,6 @@
             if (!skipLog) {
             if (!skipLog) {
                 this.log(stepInfo + ": done in " + (new Date().getTime() - this.startTime) + "ms.", "info");
                 this.log(stepInfo + ": done in " + (new Date().getTime() - this.startTime) + "ms.", "info");
             }
             }
-            this.step++;
         },
         },
 
 
         /**
         /**
@@ -749,7 +748,11 @@
                 this.steps.push(step);
                 this.steps.push(step);
             } else {
             } else {
                 // insert substep a level deeper
                 // insert substep a level deeper
+                try {
                     step.level = this.steps[this.step - 1].level + 1;
                     step.level = this.steps[this.step - 1].level + 1;
+                } catch (e) {
+                    step.level = 0;
+                }
                 var insertIndex = this.step;
                 var insertIndex = this.step;
                 while (this.steps[insertIndex] && step.level === this.steps[insertIndex].level) {
                 while (this.steps[insertIndex] && step.level === this.steps[insertIndex].level) {
                     insertIndex++;
                     insertIndex++;
@@ -899,7 +902,7 @@
                 self.waitStart();
                 self.waitStart();
                 var start = new Date().getTime();
                 var start = new Date().getTime();
                 var condition = false;
                 var condition = false;
-                var interval = setInterval(function(self, testFx, onTimeout) {
+                var interval = setInterval(function(self, testFx, timeout, onTimeout) {
                     if ((new Date().getTime() - start < timeout) && !condition) {
                     if ((new Date().getTime() - start < timeout) && !condition) {
                         condition = testFx(self);
                         condition = testFx(self);
                     } else {
                     } else {
@@ -909,7 +912,7 @@
                             if (isType(onTimeout, "function")) {
                             if (isType(onTimeout, "function")) {
                                 onTimeout.call(self, self);
                                 onTimeout.call(self, self);
                             } else {
                             } else {
-                                self.die("Expired timeout, exiting.", "error");
+                                self.die("Timeout of " + timeout + "ms expired, exiting.", "error");
                             }
                             }
                             clearInterval(interval);
                             clearInterval(interval);
                         } else {
                         } else {
@@ -920,7 +923,7 @@
                             clearInterval(interval);
                             clearInterval(interval);
                         }
                         }
                     }
                     }
-              }, 100, self, testFx, onTimeout);
+              }, 100, self, testFx, timeout, onTimeout);
             });
             });
         },
         },
 
 

@@ -5,7 +5,8 @@
         <title>CasperJS test resource</title>
         <title>CasperJS test resource</title>
         <script>
         <script>
           setTimeout(function () {
           setTimeout(function () {
-            document.querySelector("img").setAttribute("src","images/phantom.png");
+            var path = "images/phantom.png?" + new Date();
+            document.querySelector("img").setAttribute("src", path);
           }, 1000);
           }, 1000);
         </script>
         </script>
     </head>
     </head>

 do(casper) ->
 do(casper) ->
-  casper.onError = ->
-    console.log 'err'
   casper.start "tests/site/resources.html", ->
   casper.start "tests/site/resources.html", ->
-    console.log 'loaded'
     @test.assertEquals @resources.length, 1, "only one resource found"
     @test.assertEquals @resources.length, 1, "only one resource found"
-    @waitForResource "phantom.png", ->
+    onTime = ->
       @test.assertEquals(
       @test.assertEquals(
         @resources.length
         @resources.length
         2
         2
@@ -18,5 +15,7 @@ do(casper) ->
         "phantom.png"
         "phantom.png"
         "phantom image found via test string"
         "phantom image found via test string"
       )
       )
+    onTimeout = -> @test.fail "waitForResource timeout occured"
+    @waitForResource "phantom.png", onTime, onTimeout
 
 
   casper.run(-> @test.done())
   casper.run(-> @test.done())