updated code to use image utility functions

the-events-calendar · Jun 30, 2016 · 80092f1 · 80092f1
1 parent 837bd8f
commit 80092f1
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/tests/integration/Tribe/Events/Importer/File_Importer_Events_FeaturedImageTest.php b/tests/integration/Tribe/Events/Importer/File_Importer_Events_FeaturedImageTest.php
@@ -1,12 +1,9 @@
 <?php
 namespace Tribe\Events\Importer;
 
+require_once 'functions.php';
 require_once 'File_Importer_EventsTest.php';
 
-use Handlebars\Handlebars;
-use Handlebars\Loader\FilesystemLoader;
-use org\bovigo\vfs\vfsStream;
-
 class File_Importer_Events_FeaturedImageTest extends File_Importer_EventsTest {
 
 	/**
@@ -26,7 +23,7 @@ public function it_should_not_mark_record_as_invalid_if_featured_image_entry_is_
 	 * it should import and attach featured image if featured image is ok
 	 */
 	public function it_should_import_and_attach_featured_image_if_featured_image_is_ok() {
-		$image_url     = plugins_url( '_data/csv-import-test-files/featured-image/images/featured-image.jpg', codecept_data_dir() );
+		$image_url     = get_image_url();
 		$attachment_id = $this->factory()->attachment->create_upload_object( $image_url );
 		$this->featured_image_uploader->upload_and_get_attachment()->willReturn( $attachment_id );
 

diff --git a/tests/integration/Tribe/Events/Importer/File_Importer_Organizers_FeaturedImageTest.php b/tests/integration/Tribe/Events/Importer/File_Importer_Organizers_FeaturedImageTest.php
@@ -1,8 +1,9 @@
 <?php
 
 namespace Tribe\Events\Importer;
-require_once 'File_Importer_OrganizersTest.php';
 
+require_once 'functions.php';
+require_once 'File_Importer_OrganizersTest.php';
 
 class File_Importer_Organizers_FeaturedImageTest extends File_Importer_OrganizersTest {
 
@@ -11,7 +12,7 @@ class File_Importer_Organizers_FeaturedImageTest extends File_Importer_Organizer
 	 * it should not mark record as invalid if featured image entry is missing
 	 */
 	public function it_should_not_mark_record_as_invalid_if_featured_image_entry_is_missing() {
-		$sut = $this->make_instance('featured-image');
+		$sut = $this->make_instance( 'featured-image' );
 
 		$post_id = $sut->import_next_row();
 
@@ -23,11 +24,11 @@ public function it_should_not_mark_record_as_invalid_if_featured_image_entry_is_
 	 * it should import and attach featured image if featured image is ok
 	 */
 	public function it_should_import_and_attach_featured_image_if_featured_image_is_ok() {
-		$image_url     = plugins_url( '_data/csv-import-test-files/featured-image/images/featured-image.jpg', codecept_data_dir() );
+		$image_url     = get_image_url();
 		$attachment_id = $this->factory()->attachment->create_upload_object( $image_url );
 		$this->featured_image_uploader->upload_and_get_attachment()->willReturn( $attachment_id );
 
-		$sut = $this->make_instance('featured-image');
+		$sut = $this->make_instance( 'featured-image' );
 
 		$post_id = $sut->import_next_row();
 
@@ -41,7 +42,7 @@ public function it_should_import_and_attach_featured_image_if_featured_image_is_
 	public function it_should_not_import_and_attach_featured_image_if_featured_image_is_not_ok() {
 		$this->featured_image_uploader->upload_and_get_attachment()->willReturn( false );
 
-		$sut = $this->make_instance('featured-image');
+		$sut = $this->make_instance( 'featured-image' );
 
 		$post_id = $sut->import_next_row();
 

diff --git a/tests/integration/Tribe/Events/Importer/File_Importer_Venues_FeaturedImageTest.php b/tests/integration/Tribe/Events/Importer/File_Importer_Venues_FeaturedImageTest.php
@@ -1,16 +1,19 @@
 <?php
 
 namespace Tribe\Events\Importer;
+
+require_once 'functions.php';
 require_once 'File_Importer_VenuesTest.php';
 
-class File_Importer_Venues_FeaturedImageTest extends File_Importer_VenuesTest{
+
+class File_Importer_Venues_FeaturedImageTest extends File_Importer_VenuesTest {
 
 	/**
 	 * @test
 	 * it should not mark record as invalid if featured image entry is missing
 	 */
 	public function it_should_not_mark_record_as_invalid_if_featured_image_entry_is_missing() {
-		$sut = $this->make_instance('featured-image');
+		$sut = $this->make_instance( 'featured-image' );
 
 		$post_id = $sut->import_next_row();
 
@@ -22,12 +25,12 @@ public function it_should_not_mark_record_as_invalid_if_featured_image_entry_is_
 	 * it should import and attach featured image if featured image is ok
 	 */
 	public function it_should_import_and_attach_featured_image_if_featured_image_is_ok() {
-		$image_url     = plugins_url( '_data/csv-import-test-files/featured-image/images/featured-image.jpg', codecept_data_dir() );
+		$image_url     = get_image_url();
 		$attachment_id = $this->factory()->attachment->create_upload_object( $image_url );
 		$this->featured_image_uploader->upload_and_get_attachment()->willReturn( $attachment_id );
 		$this->field_map[] = 'venue_thumbnail';
 
-		$sut = $this->make_instance('featured-image');
+		$sut = $this->make_instance( 'featured-image' );
 
 		$post_id = $sut->import_next_row();
 
@@ -42,7 +45,7 @@ public function it_should_not_import_and_attach_featured_image_if_featured_image
 		$this->featured_image_uploader->upload_and_get_attachment()->willReturn( false );
 		$this->field_map[] = 'venue_thumbnail';
 
-		$sut = $this->make_instance('featured-image');
+		$sut = $this->make_instance( 'featured-image' );
 
 		$post_id = $sut->import_next_row();