Bring tests to green

mikebronner · Sep 17, 2017 · 5dec036 · 5dec036
1 parent 1dfae4d
commit 5dec036
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 92 deletions.
diff --git a/resources/views/tests/form.blade.php b/resources/views/tests/form.blade.php
@@ -1,4 +1,4 @@
-@extends('layouts.app')
+@extends('genealabs-laravel-caffeine::tests.layout')
 
 @section('content')
     <form method="post">

diff --git a/resources/views/tests/layout.blade.php b/resources/views/tests/layout.blade.php
@@ -15,92 +15,6 @@
 </head>
 <body>
     <div id="app">
-        <nav class="navbar navbar-default navbar-static-top">
-            <div class="container">
-                <div class="navbar-header">
-
-                    <!-- Collapsed Hamburger -->
-                    <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#app-navbar-collapse">
-                        <span class="sr-only">Toggle Navigation</span>
-                        <span class="icon-bar"></span>
-                        <span class="icon-bar"></span>
-                        <span class="icon-bar"></span>
-                    </button>
-
-                    <!-- Branding Image -->
-                    <a class="navbar-brand" href="{{ url('/') }}">
-                        {{ config('app.name', 'Laravel') }}
-                    </a>
-                </div>
-
-                <div class="collapse navbar-collapse" id="app-navbar-collapse">
-                    <!-- Left Side Of Navbar -->
-                    <ul class="nav navbar-nav">
-                        <li class="dropdown">
-                            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
-                                Caffeine <span class="caret"></span>
-                            </a>
-
-                            <ul class="dropdown-menu" role="menu">
-                                <li><a href="{{ url('/caffeine/drip') }}">Drip</a></li>
-                                <li><a href="{{ url('/caffeine/expire') }}">Expire</a></li>
-                            </ul>
-                        </li>
-                        <li class="dropdown">
-                            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
-                                Casts <span class="caret"></span>
-                            </a>
-
-                            <ul class="dropdown-menu" role="menu">
-                                <li><a href="{{ url('/genealabs/laravel-casts/examples/bootstrap3') }}">Bootstrap 3</a></li>
-                                <li><a href="{{ url('/genealabs/laravel-casts/examples/bootstrap4') }}">Bootstrap 4</a></li>
-                            </ul>
-                        </li>
-                        <li><a href="{{ route('genealabs.laravel-governor.roles.index') }}">Governor</a></li>
-                        <li class="dropdown">
-                            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
-                                Mixpanel <span class="caret"></span>
-                            </a>
-
-                            <ul class="dropdown-menu" role="menu">
-                                <li><a href="{{ url('/mixpanel/blade') }}">Blade</a></li>
-                                <li><a href="{{ url('/mixpanel/elixir') }}">Elixir</a></li>
-                            </ul>
-                        </li>
-                    </ul>
-
-                    <!-- Right Side Of Navbar -->
-                    <ul class="nav navbar-nav navbar-right">
-                        <!-- Authentication Links -->
-                        @guest
-                            <li><a href="{{ route('login') }}">Login</a></li>
-                            <li><a href="{{ route('register') }}">Register</a></li>
-                        @else
-                            <li class="dropdown">
-                                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
-                                    {{ Auth::user()->name }} <span class="caret"></span>
-                                </a>
-
-                                <ul class="dropdown-menu" role="menu">
-                                    <li>
-                                        <a href="{{ route('logout') }}"
-                                            onclick="event.preventDefault();
-                                                     document.getElementById('logout-form').submit();">
-                                            Logout
-                                        </a>
-
-                                        <form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
-                                            {{ csrf_field() }}
-                                        </form>
-                                    </li>
-                                </ul>
-                            </li>
-                        @endguest
-                    </ul>
-                </div>
-            </div>
-        </nav>
-
         @yield('content')
     </div>
 

diff --git a/src/Http/Controllers/Test.php b/src/Http/Controllers/Test.php
@@ -10,14 +10,14 @@ public function drippedForm() : View
         config()->set('session.lifetime', 1);
         config()->set('genealabs-laravel-caffeine.dripIntervalInMilliSeconds', 50000);
 
-        return view('genealabs-laravel-caffeine::tests.non-expired');
+        return view('genealabs-laravel-caffeine::tests.form');
     }
 
     public function expiredForm() : View
     {
         config()->set('session.lifetime', 1);
         config()->set('genealabs-laravel-caffeine.dripIntervalInMilliSeconds', 300000);
 
-        return view('genealabs-laravel-caffeine::tests.expired');
+        return view('genealabs-laravel-caffeine.tests.form');
     }
 }
diff --git a/src/Http/Middleware/LaravelCaffeineDripMiddleware.php b/src/Http/Middleware/LaravelCaffeineDripMiddleware.php
@@ -1,8 +1,8 @@
 <?php namespace GeneaLabs\LaravelCaffeine\Http\Middleware;
 
+use Closure;
 use GeneaLabs\LaravelCaffeine\Dripper;
 use Illuminate\Http\Request;
-use Closure;
 
 class LaravelCaffeineDripMiddleware
 {

diff --git a/src/Providers/Service.php b/src/Providers/Service.php
@@ -19,6 +19,10 @@ public function boot()
 
         $configPath = __DIR__ . '/../../config/genealabs-laravel-caffeine.php';
         $this->mergeConfigFrom($configPath, 'genealabs-laravel-caffeine');
+        $this->loadViewsFrom(
+            __DIR__ . '/../../resources/views',
+            'genealabs-laravel-caffeine'
+        );
         $this->publishes([
             $configPath => config_path('genealabs-laravel-caffeine.php')
         ], 'config');

diff --git a/tests/Feature/CaffeineTest.php b/tests/Feature/CaffeineTest.php
@@ -14,8 +14,7 @@ public function testBootstrap3TestPageCanLoad()
 
     public function testMiddlewareInjectsDripScript()
     {
-        // dd(\Route::getRoutes());
-        $expectedResult = "<script>setInterval(function(){var e=window.XMLHttpRequest?new XMLHttpRequest:new ActiveXObject('Microsoft.XMLHTTP');e.open('GET','/genealabs/laravel-caffeine/drip',!0);e.setRequestHeader('X-Requested-With','XMLHttpRequest');e.send();}, 300000);</script>";
+        $expectedResult = "<script>setInterval(function(){var e=window.XMLHttpRequest?new XMLHttpRequest:new ActiveXObject('Microsoft.XMLHTTP');e.open('GET','/genealabs/laravel-caffeine/drip',!0);e.setRequestHeader('X-Requested-With','XMLHttpRequest');e.send();}, 50000);</script>";
 
         $response = $this->get(route('genealabs-laravel-caffeine.tests.form'));