From 09e83ab689049935ed09a3531882b8bddaf9f72e Mon Sep 17 00:00:00 2001
From: Joseph Cohen <joseph.cohen@dinkbit.com>
Date: Sat, 21 Mar 2015 02:33:38 -0600
Subject: [PATCH] Fix tests

---
 app/Providers/BusServiceProvider.php         |  4 +++-
 app/Providers/ConfigServiceProvider.php      |  4 +++-
 app/Providers/EventServiceProvider.php       |  4 +++-
 app/Providers/RouteServiceProvider.php       |  4 +++-
 phpunit.xml.dist                             | 22 ++++++++------------
 resources/views/partials/analytics.blade.php |  2 +-
 6 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/app/Providers/BusServiceProvider.php b/app/Providers/BusServiceProvider.php
index 173b46e0..12371430 100644
--- a/app/Providers/BusServiceProvider.php
+++ b/app/Providers/BusServiceProvider.php
@@ -1,4 +1,6 @@
-<?php namespace CachetHQ\Cachet\Providers;
+<?php
+
+namespace CachetHQ\Cachet\Providers;
 
 use Illuminate\Bus\Dispatcher;
 use Illuminate\Support\ServiceProvider;
diff --git a/app/Providers/ConfigServiceProvider.php b/app/Providers/ConfigServiceProvider.php
index eb3e87fa..e236297e 100644
--- a/app/Providers/ConfigServiceProvider.php
+++ b/app/Providers/ConfigServiceProvider.php
@@ -1,4 +1,6 @@
-<?php namespace CachetHQ\Cachet\Providers;
+<?php
+
+namespace CachetHQ\Cachet\Providers;
 
 use Illuminate\Support\ServiceProvider;
 
diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php
index 889d7d24..6dbe6b0c 100644
--- a/app/Providers/EventServiceProvider.php
+++ b/app/Providers/EventServiceProvider.php
@@ -1,4 +1,6 @@
-<?php namespace CachetHQ\Cachet\Providers;
+<?php
+
+namespace CachetHQ\Cachet\Providers;
 
 use Illuminate\Contracts\Events\Dispatcher as DispatcherContract;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index b88da690..ce6a01dc 100644
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -1,4 +1,6 @@
-<?php namespace CachetHQ\Cachet\Providers;
+<?php
+
+namespace CachetHQ\Cachet\Providers;
 
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
 use Illuminate\Routing\Router;
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 6c075654..d66acd01 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -1,27 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit backupGlobals="false"
          backupStaticAttributes="false"
-         beStrictAboutTestsThatDoNotTestAnything="true"
-         beStrictAboutOutputDuringTests="true"
          bootstrap="bootstrap/autoload.php"
          colors="true"
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
          processIsolation="false"
-         stopOnError="false"
          stopOnFailure="false"
-         syntaxCheck="true"
-         verbose="true"
->
+         syntaxCheck="false">
     <testsuites>
-        <testsuite name="Cachet Test Suite">
-            <directory>./tests</directory>
+        <testsuite name="Application Test Suite">
+            <directory>./tests/</directory>
         </testsuite>
     </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">./src</directory>
-        </whitelist>
-    </filter>
+    <php>
+        <env name="APP_ENV" value="testing"/>
+        <env name="CACHE_DRIVER" value="array"/>
+        <env name="SESSION_DRIVER" value="array"/>
+        <env name="QUEUE_DRIVER" value="sync"/>
+    </php>
 </phpunit>
diff --git a/resources/views/partials/analytics.blade.php b/resources/views/partials/analytics.blade.php
index 0cfc627b..b50a7be3 100644
--- a/resources/views/partials/analytics.blade.php
+++ b/resources/views/partials/analytics.blade.php
@@ -4,7 +4,7 @@
   (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
   m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
   })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', '{{ $googleId }}', '{{ $_SERVER['SERVER_NAME'] }}');
+  ga('create', '{{ $googleId }}', '{{ $_SERVER['SERVER_NAME'] or '' }}');
   ga('send', 'pageview');
 </script>
 @endif