Merge pull request #3 from andrewandante/feature/ss4

Fix tests, revert flush change

code/Workable.php

@@ -173,7 +173,7 @@ public function callHttpClient(string $url, array $params = [], string $method =
      */
     public static function flush()
     {
-        static::singleton()->getCache()->clear();
+        Injector::inst()->get(CacheInterface::class . '.workable')->clear();
     }
 
     /**

code/WorkableResult.php

@@ -28,7 +28,7 @@ public function __get($prop)
 
         $data = $this->apiData[$snaked] ?? null;
 
-        if (is_array($this->apiData[$snaked])) {
+        if (is_array($data)) {
             return new WorkableResult($data);
         }
 

tests/TestWorkableRestfulService.php

@@ -2,11 +2,12 @@
 
 namespace SilverStripe\Workable\Tests;
 
+use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\Response;
 
-class TestWorkableRestfulService
+class TestWorkableRestfulService extends Client
 {
-    public function request($method, $url, $params = [])
+    public function request($method, $url = '', $params = [])
     {
         switch ($url) {
             case 'jobs':

tests/WorkableTest.php

@@ -2,42 +2,53 @@
 
 namespace SilverStripe\Workable\Tests;
 
+use GuzzleHttp\ClientInterface;
 use Psr\Log\LoggerInterface;
+use Psr\SimpleCache\CacheInterface;
+use SilverStripe\Config\Collections\CachedConfigCollection;
+use SilverStripe\Core\Cache\DefaultCacheFactory;
 use SilverStripe\Core\Environment;
+use SilverStripe\Core\Injector\InjectorLoader;
 use SilverStripe\Dev\SapphireTest;
+use SilverStripe\Versioned\Caching\VersionedCacheAdapter;
+use SilverStripe\Workable\Tests\TestWorkableRestfulService;
 use SilverStripe\Workable\Workable;
 use SilverStripe\Core\Config\Config;
 use SilverStripe\Core\Injector\Injector;
+use SilverStripe\Workable\WorkableRestfulServiceFactory;
 use SilverStripe\Workable\WorkableResult;
-use SilverStripe\Workable\Tests\TestWorkableRestfulService;
 
 class WorkableTest extends SapphireTest
 {
-    public function setUp()
+    public static function setUpBeforeClass()
     {
-        parent::setUp();
-        $config = Config::inst()->get(Injector::class, 'WorkableRestfulService');
+        parent::setUpBeforeClass();
+        Workable::config()->set('subdomain', 'example');
+        $config = Config::inst()->get(Injector::class, 'GuzzleHttp\ClientInterface.workable');
         $config['class'] = TestWorkableRestfulService::class;
-        Config::inst()->update(Injector::class, 'WorkableRestfulService', $config);
+        Config::inst()->merge(Injector::class, 'GuzzleHttp\ClientInterface.workable', $config);
+    }
 
+    protected function setUp()
+    {
+        parent::setUp();
         Environment::setEnv('WORKABLE_API_KEY', 'test');
-        Config::inst()->update(Workable::class, 'subdomain', 'example');
     }
 
     public function testThrowsIfNoSubdomain()
     {
         Config::inst()->remove(Workable::class, 'subdomain');
         $this->setExpectedException('RuntimeException');
 
-        Workable::create()->callRestfulService('test');
+        Workable::create()->callHttpClient('test');
     }
 
     public function testThrowsIfNoApiKey()
     {
         Environment::setEnv('WORKABLE_API_KEY', null);
         $this->setExpectedException('RuntimeException');
 
-        Workable::create()->callRestfulService('test');
+        Workable::create()->callHttpClient('test');
     }
 
     public function testConvertsSnakeCase()