Fix tests

Author: barryvdh

src/DebugBar/JavascriptRenderer.php

@@ -947,7 +947,7 @@ public function renderHead()
         }
 
         foreach ($inlineJs as $content) {
-            $html .= sprintf('<script type="text/javascript" %s>%s</script>' . "\n", $nonce, $content);
+            $html .= sprintf('<script type="text/javascript"%s>%s</script>' . "\n", $nonce, $content);
         }
 
         foreach ($inlineHead as $content) {
@@ -1045,9 +1045,9 @@ public function render($initialize = true, $renderStackedData = true)
         $nonce = $this->getNonceAttribute();
 
         if ($this->useRequireJs){
-            return "<script type=\"text/javascript\" {$nonce}>\nrequire(['debugbar'], function(PhpDebugBar){ $js });\n</script>\n";
+            return "<script type=\"text/javascript\"{$nonce}>\nrequire(['debugbar'], function(PhpDebugBar){ $js });\n</script>\n";
         } else {
-            return "<script type=\"text/javascript\" {$nonce}>\n$js\n</script>\n";
+            return "<script type=\"text/javascript\"{$nonce}>\n$js\n</script>\n";
         }
 
     }
@@ -1188,7 +1188,7 @@ protected function getAddDatasetCode($requestId, $data, $suffix = null)
     protected function getNonceAttribute()
     {
         if ($nonce = $this->getCspNonce()) {
-            return 'nonce="' . $nonce .'"';
+            return ' nonce="' . $nonce .'"';
         }
 
         return '';

tests/DebugBar/Tests/DataCollector/TimeDataCollectorTest.php

@@ -27,6 +27,7 @@ public function testAddMeasure()
     public function testStartStopMeasure()
     {
         $this->c->startMeasure('foo', 'bar', 'baz');
+        usleep(1000);
         $this->c->stopMeasure('foo', array('bar' => 'baz'));
         $m = $this->c->getMeasures();
         $this->assertCount(1, $m);

tests/DebugBar/Tests/JavascriptRendererTest.php

@@ -124,7 +124,7 @@ public function testRenderFullInitialization()
     {
         $this->debugbar->addCollector(new \DebugBar\DataCollector\MessagesCollector());
         $this->r->addControl('time', array('icon' => 'time', 'map' => 'time', 'default' => '"0s"'));
-        $expected = rtrim(file_get_contents(__DIR__ . '/full_init.html'));
+        $expected = str_replace("\r\n", "\n", rtrim(file_get_contents(__DIR__ . '/full_init.html')));
         $this->assertStringStartsWith($expected, $this->r->render());
     }