From 766fad6bb2e4ab2f092bf7eac2e6faa19372051d Mon Sep 17 00:00:00 2001 From: Timothy J Warren Date: Mon, 19 Oct 2015 15:13:18 -0400 Subject: [PATCH] Remove risky tests, update .gitignore --- .gitignore | 6 +++++- tests/AnimeClient/Auth/HummingbirdAuthTest.php | 10 +++++++++- ...odelTest.php => AnimeModelTest-inProgress.php} | 4 ++-- tests/AnimeClient/Model/BaseApiModelTest.php | 15 --------------- 4 files changed, 16 insertions(+), 19 deletions(-) rename tests/AnimeClient/Model/{AnimeModelTest.php => AnimeModelTest-inProgress.php} (92%) diff --git a/.gitignore b/.gitignore index a2b08c12..3321b514 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +.codelite +*.phprj +*.workspace vendor app/cache/* public/images/* @@ -7,4 +10,5 @@ composer.lock *.db *.sqlite3 docs/* -coverage/* \ No newline at end of file +coverage/* +tests/test_data/sessions/* \ No newline at end of file diff --git a/tests/AnimeClient/Auth/HummingbirdAuthTest.php b/tests/AnimeClient/Auth/HummingbirdAuthTest.php index 2418a8e9..692e3b87 100644 --- a/tests/AnimeClient/Auth/HummingbirdAuthTest.php +++ b/tests/AnimeClient/Auth/HummingbirdAuthTest.php @@ -76,6 +76,14 @@ class HummingbirdAuthTest extends AnimeClient_TestCase { $actual = $this->auth->authenticate($password); $this->assertEquals($expected, $actual); - + } + + public function testIsAuthenticated() + { + $data = $this->dataAuthenticate(); + call_user_func_array([$this, 'testAuthenticate'], $data['successful auth call']); + $this->assertTrue($this->auth->is_authenticated()); + $this->auth->log_out(); + $this->assertFalse($this->auth->is_authenticated()); } } \ No newline at end of file diff --git a/tests/AnimeClient/Model/AnimeModelTest.php b/tests/AnimeClient/Model/AnimeModelTest-inProgress.php similarity index 92% rename from tests/AnimeClient/Model/AnimeModelTest.php rename to tests/AnimeClient/Model/AnimeModelTest-inProgress.php index feab3652..9b4f092b 100644 --- a/tests/AnimeClient/Model/AnimeModelTest.php +++ b/tests/AnimeClient/Model/AnimeModelTest-inProgress.php @@ -23,8 +23,8 @@ class AnimeModelTest extends AnimeClient_TestCase { return $out; } - public function testSortByName() + /*public function testSortByName() { $data = $this->animeModel->_get_list_from_api("completed"); - } + }*/ } \ No newline at end of file diff --git a/tests/AnimeClient/Model/BaseApiModelTest.php b/tests/AnimeClient/Model/BaseApiModelTest.php index bc5fd432..a5b6f85a 100644 --- a/tests/AnimeClient/Model/BaseApiModelTest.php +++ b/tests/AnimeClient/Model/BaseApiModelTest.php @@ -17,21 +17,6 @@ class BaseApiModelTest extends AnimeClient_TestCase { $this->model = new MockBaseApiModel($this->container); } - public function testBaseApiModelSanity() - { - $baseApiModel = $this->model; - - // Some basic type checks for class memebers - $this->assertInstanceOf('\Aviat\AnimeClient\Model', $baseApiModel); - $this->assertInstanceOf('\Aviat\AnimeClient\Model\API', $baseApiModel); - - $this->assertInstanceOf('\GuzzleHttp\Client', $baseApiModel->client); - $this->assertInstanceOf('\GuzzleHttp\Cookie\CookieJar', $baseApiModel->cookieJar); - - $this->assertTrue(is_string($baseApiModel->base_url)); - $this->assertTrue(empty($baseApiModel->base_url)); - } - protected function getIp() { $response = $this->model->get('/ip');