Fixed search tests to be able to rerun without the index growing

spira · Aug 25, 2015 · d3a95d5 · d3a95d5
1 parent 87308a3
commit d3a95d5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/api/tests/ElasticSearchTest.php b/api/tests/ElasticSearchTest.php
@@ -3,7 +3,6 @@
 use App\Models\TestEntity;
 /**
  * Class ElasticSearchTest
- * @group failing
  */
 class ElasticSearchTest extends TestCase
 {
@@ -13,6 +12,8 @@ public function setUp()
         parent::setUp();
         TestEntity::flushEventListeners();
         TestEntity::boot(); //run event listeners
+
+        TestEntity::removeAllFromIndex();
     }
 
     /**
@@ -33,6 +34,8 @@ public function testElasticSearchAddToIndex()
 
 
         $this->assertEquals(1, $search->totalHits());
+
+        $testEntity->delete(); //clean up so it doesn't remain in the index
     }
 
     public function testElasticSearchRemoveFromIndex()
@@ -72,6 +75,8 @@ public function testElasticSearchUpdateIndex()
         ]);
 
         $this->assertEquals(1, $search->totalHits());
+
+        $testEntity->delete(); //clean up so it doesn't remain in the index
     }
 
 }
diff --git a/api/tests/integration/EntityTest.php b/api/tests/integration/EntityTest.php
@@ -656,9 +656,7 @@ public function testEntitySearch()
             'varchar' => 'searchforthisstring'
         ]);
 
-        TestEntity::addAllToIndex();
-
-        sleep(1); //give the elastic search agent time to index (!)
+        sleep(1); //give the elastic search agent time to index
 
         $this->get('/test/entities/pages?q=searchforthisstring', ['Range'=>'entities=0-9']);
 
@@ -675,9 +673,6 @@ public function testEntitySearch()
 
     public function testEntitySearchNoResults()
     {
-        TestEntity::reindex();
-
-        sleep(1); //give the elastic search agent time to index
 
         $this->get('/test/entities/pages?q=thisstringwontreturnresults', ['Range'=>'entities=0-9']);