Fix failing test

Author: Torann

src/Cache.php

@@ -38,7 +38,7 @@ public function __construct(CacheManager $cache, $tags, $expires = 30)
      *
      * @param string $name
      *
-     * @return array
+     * @return Location|null
      */
     public function get($name)
     {

src/GeoIP.php

@@ -115,7 +115,6 @@ public function getLocation($ip = null)
 
         // Should cache location
         if ($this->shouldCache($ip, $this->location)) {
-            dd('Cache It');
             $this->getCache()->set($ip, $this->location);
         }
 
@@ -135,7 +134,7 @@ private function find($ip = null)
         // Check cache for location
         if ($this->config('cache', 'none') !== 'none' && $location = $this->getCache()->get($ip)) {
             $location->cached = true;
-dd('Cached!');
+
             return $location;
         }
 

tests/Cache/LaravelTest.php

@@ -0,0 +1,84 @@
+<?php
+
+namespace Torann\GeoIP\Tests;
+
+use Mockery;
+
+class CacheTest extends TestCase
+{
+    /**
+     * @test
+     */
+    public function shouldReturnValidLocation()
+    {
+        $data = [
+            'ip' => '81.2.69.142',
+            'iso_code' => 'US',
+            'lat' => 41.31,
+            'lon' => -72.92,
+        ];
+
+        $cacheMock = Mockery::mock('Illuminate\Cache\CacheManager');
+        $cacheMock->shouldReceive('get')->with($data['ip'])->andReturn($data);
+
+        $geo_ip = $this->makeGeoIP([], $cacheMock);
+
+        $location = $geo_ip->getCache()->get($data['ip']);
+
+        $this->assertInstanceOf(\Torann\GeoIP\Location::class, $location);
+        $this->assertEquals($location->ip, $data['ip']);
+        $this->assertEquals($location->default, false);
+    }
+
+    /**
+     * @test
+     */
+    public function shouldReturnInvalidLocation()
+    {
+        $cacheMock = Mockery::mock('Illuminate\Cache\CacheManager');
+
+        $geo_ip = $this->makeGeoIP([], $cacheMock);
+
+        $cacheMock->shouldReceive('get')->with('81.2.69.142')->andReturn(null);
+        $cacheMock->shouldReceive('tags')->with($geo_ip->config('cache_tags'))->andReturnSelf();
+
+        $this->assertEquals($geo_ip->getCache()->get('81.2.69.142'), null);
+    }
+
+    /**
+     * @test
+     */
+    public function shouldSetLocation()
+    {
+        $location = new \Torann\GeoIP\Location([
+            'ip' => '81.2.69.142',
+            'iso_code' => 'US',
+            'lat' => 41.31,
+            'lon' => -72.92,
+        ]);
+
+        $cacheMock = Mockery::mock('Illuminate\Cache\CacheManager');
+
+        $geo_ip = $this->makeGeoIP([], $cacheMock);
+
+        $cacheMock->shouldReceive('put')->withArgs(['81.2.69.142', $location->toArray(), $geo_ip->config('cache_expires')])->andReturn(null);
+        $cacheMock->shouldReceive('tags')->with($geo_ip->config('cache_tags'))->andReturnSelf();
+
+        $this->assertEquals($geo_ip->getCache()->set('81.2.69.142', $location), null);
+    }
+
+    /**
+     * @test
+     */
+    public function shouldFlushLocations()
+    {
+        $cacheMock = Mockery::mock('Illuminate\Cache\CacheManager');
+
+        $geo_ip = $this->makeGeoIP([], $cacheMock);
+
+        $cacheMock->shouldReceive('flush')->andReturn(true);
+        $cacheMock->shouldReceive('tags')->with($geo_ip->config('cache_tags'))->andReturnSelf();
+
+        $this->assertEquals($geo_ip->getCache()->flush(), true);
+    }
+}

tests/Cache/SessionTest.php

@@ -2,6 +2,8 @@
 
 namespace Torann\GeoIP\Tests;
 
+use Mockery;
+
 class GeoIPTest extends TestCase
 {
     /**
@@ -37,16 +39,8 @@ public function testGetService()
      */
     public function testGetCache()
     {
-        $geo_ip = $this->makeGeoIP([
-            'cache' => 'session',
-        ]);
-
-        // Get config values
-        $config = $this->getConfig()['cache_drivers']['session'];
-        unset($config['class']);
-
-        self::$functions->shouldReceive('app')->with('Torann\GeoIP\Cache\Session', [$config])->andReturn(true);
+        $geo_ip = $this->makeGeoIP();
 
-        $this->assertEquals($geo_ip->getCache(), true);
+        $this->assertInstanceOf(\Torann\GeoIP\Cache::class, $geo_ip->getCache());
     }
 }

tests/CacheTest.php

@@ -19,11 +19,15 @@ public function tearDown()
         Mockery::close();
     }
 
-    protected function makeGeoIP(array $config = [])
+    protected function makeGeoIP(array $config = [], $cacheMock = null)
     {
+        $cacheMock = $cacheMock ?: Mockery::mock('Illuminate\Cache\CacheManager');
+
         $config = array_merge($this->getConfig(), $config);
 
-        return new \Torann\GeoIP\GeoIP($config);
+        $cacheMock->shouldReceive('tags')->with(['torann-geoip-location'])->andReturnSelf();
+
+        return new \Torann\GeoIP\GeoIP($config, $cacheMock);
     }
 
     protected function getConfig()