Updated tests and configuration; 100% code coverage

jeremeamia · jeremeamia · commit aed91c4e6acf · 2013-08-30T23:55:25.000-07:00
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
 composer.lock
 composer.phar
-phpunit.xml
 vendor
diff --git a/phpunit.xml b/phpunit.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         bootstrap="./tests/bootstrap.php"
+         colors="false"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false"
+         syntaxCheck="false">
+
+    <testsuites>
+        <testsuite name="AwsServiceProvider Test Suite">
+            <directory>./tests/</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist addUncoveredFilesFromWhitelist="false">
+            <directory suffix=".php">src</directory>
+            <exclude>
+                <directory suffix=".php">vendor</directory>
+            </exclude>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
diff --git a/tests/Aws/Laravel/Test/AwsServiceProviderTest.php b/tests/Aws/Laravel/Test/AwsServiceProviderTest.php
@@ -26,10 +26,9 @@ public function testRegisterAwsServiceProviderWithGlobalConfig()
         $app = $this->setupApplication();
         $this->setupServiceProvider($app);
 
-        // Simulate global config
+        // Simulate global config; specify config file
         $app['config']->set('aws', array(
-            'key'    => 'FOO',
-            'secret' => 'BAR',
+            'config_file' => __DIR__ . '/test_services.json'
         ));
 
         // Get an instance of a client (S3)
@@ -38,8 +37,8 @@ public function testRegisterAwsServiceProviderWithGlobalConfig()
         $this->assertInstanceOf('Aws\S3\S3Client', $s3);
 
         // Verify that the client received the credentials from the global config
-        $this->assertEquals('FOO', $s3->getCredentials()->getAccessKeyId());
-        $this->assertEquals('BAR', $s3->getCredentials()->getSecretKey());
+        $this->assertEquals('change_me', $s3->getCredentials()->getAccessKeyId());
+        $this->assertEquals('change_me', $s3->getCredentials()->getSecretKey());
 
         // Make sure the user agent contains Laravel information
         $command = $s3->getCommand('ListBuckets');
@@ -62,4 +61,11 @@ public function testRegisterAwsServiceProviderWithPackageConfig()
         $this->assertEquals('YOUR_AWS_ACCESS_KEY_ID', $s3->getCredentials()->getAccessKeyId());
         $this->assertEquals('YOUR_AWS_SECRET_KEY', $s3->getCredentials()->getSecretKey());
     }
+
+    public function testServiceNameIsProvided()
+    {
+        $app = $this->setupApplication();
+        $provider = $this->setupServiceProvider($app);
+        $this->assertContains('aws', $provider->provides());
+    }
 }
diff --git a/tests/Aws/Laravel/Test/test_services.json b/tests/Aws/Laravel/Test/test_services.json
@@ -0,0 +1,20 @@
+{
+    "includes": ["_aws"],
+    "services": {
+        "default_settings": {
+            "params": {
+                "key": "change_me",
+                "secret": "change_me",
+                "region": "us-east-1",
+                "ssl.certificate_authority": true
+            }
+        },
+        "cloudfront": {
+            "extends": "cloudfront",
+            "params": {
+                "private_key": "change_me",
+                "key_pair_id": "change_me"
+            }
+        }
+    }
+}
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -1,4 +1,12 @@
 <?php
 
+// Make sure Composer has been run
+if (!file_exists(__DIR__ . '/../composer.lock')) {
+    die('You must do a Composer install before running the tests.');
+}
+
+// Include Composer autoloader
 require_once __DIR__ . '/../vendor/autoload.php';
+
+// Include the base test class that doesn't get autoloaded
 require_once __DIR__ . '/Aws/Laravel/Test/AwsServiceProviderTestCase.php';
