Merge branch 'master' into development

2 files changed, 10 insertions, 8 deletions

diff --git a/phpunit.xml b/phpunit.xml
index d70bdda..d8f8abe 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<phpunit bootstrap="./vendor/autoload.php" colors="true">
+<phpunit bootstrap="vendor/autoload.php" colors="true">
     <testsuites>
         <testsuite name="GoogleAuthenticator Test Suite">
             <directory>./tests</directory>
diff --git a/tests/GoogleAuthenticatorTest.php b/tests/GoogleAuthenticatorTest.php
index b1700b7..4186402 100644
--- a/tests/GoogleAuthenticatorTest.php
+++ b/tests/GoogleAuthenticatorTest.php
@@ -1,6 +1,6 @@
 <?php
 
-use POPdotco\GoogleAuthenticator;
+use CraftBlue\GoogleAuthenticator;
 
 class GoogleAuthenticatorTest extends PHPUnit_Framework_TestCase {
 
@@ -15,6 +15,8 @@ class GoogleAuthenticatorTest extends PHPUnit_Framework_TestCase {
     protected function setUp()
     {
         $this->ga = new GoogleAuthenticator();
+
+        parent::setUp();
     }
 
     /**
@@ -23,7 +25,7 @@ class GoogleAuthenticatorTest extends PHPUnit_Framework_TestCase {
     public function testItCanBeInstantiated()
     {
         $ga = new GoogleAuthenticator();
-        $this->assertInstanceOf('POPdotco\GoogleAuthenticator', $ga);
+        $this->assertInstanceOf(CraftBlue\GoogleAuthenticator::class, $ga);
     }
 
     /**
@@ -91,7 +93,7 @@ class GoogleAuthenticatorTest extends PHPUnit_Framework_TestCase {
     {
         $result = $this->ga->setCodeLength(6);
 
-        $this->assertInstanceOf('POPdotco\GoogleAuthenticator', $result);
+        $this->assertInstanceOf(CraftBlue\GoogleAuthenticator::class, $result);
     }
 
     /**
@@ -128,10 +130,10 @@ class GoogleAuthenticatorTest extends PHPUnit_Framework_TestCase {
     {
         return array(
             // secret, time, code
-            array('SECRET', 0, '200470'),
-            array('SECRET', 1385909245, '780018'),
-            array('SECRET', 1378934578, '705013'),
+            array('SECRET', 0, '857148'),
+            array('SECRET', 1385909245, '979377'),
+            array('SECRET', 1378934578, '560773'),
         );
     }
 
-} 
\ No newline at end of file
+}