From 777712a0e9c77ede475e1df06242f6f540f68694 Mon Sep 17 00:00:00 2001 From: Kristina Lim Date: Thu, 31 Jan 2019 04:52:13 +0800 Subject: [PATCH 1/3] Fix race condition in enterprise image feature specs --- spec/features/admin/enterprises/images_spec.rb | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/spec/features/admin/enterprises/images_spec.rb b/spec/features/admin/enterprises/images_spec.rb index b2f1cb0787..ea903b4151 100644 --- a/spec/features/admin/enterprises/images_spec.rb +++ b/spec/features/admin/enterprises/images_spec.rb @@ -35,8 +35,7 @@ feature "Managing enterprise images" do go_to_images within ".page-admin-enterprises-form__logo-field-group" do - expect(page).to have_selector(".image-field-group__preview-image") - expect(html).to include("logo-white.png") + expect(page).to have_selector(".image-field-group__preview-image[src*='logo-white.png']") end # Replacing image @@ -47,8 +46,7 @@ feature "Managing enterprise images" do go_to_images within ".page-admin-enterprises-form__logo-field-group" do - expect(page).to have_selector(".image-field-group__preview-image") - expect(html).to include("logo-black.png") + expect(page).to have_selector(".image-field-group__preview-image[src*='logo-black.png']") end # Removing image @@ -73,8 +71,7 @@ feature "Managing enterprise images" do go_to_images within ".page-admin-enterprises-form__promo-image-field-group" do - expect(page).to have_selector(".image-field-group__preview-image") - expect(html).to include("logo-white.jpg") + expect(page).to have_selector(".image-field-group__preview-image[src*='logo-white.jpg']") end # Replacing image @@ -85,8 +82,7 @@ feature "Managing enterprise images" do go_to_images within ".page-admin-enterprises-form__promo-image-field-group" do - expect(page).to have_selector(".image-field-group__preview-image") - expect(html).to include("logo-black.jpg") + expect(page).to have_selector(".image-field-group__preview-image[src*='logo-black.jpg']") end # Removing image From a3c808a172cf68642d62975dc91a6e867192ff84 Mon Sep 17 00:00:00 2001 From: Kristina Lim Date: Thu, 31 Jan 2019 05:02:57 +0800 Subject: [PATCH 2/3] Refactor checking of preview image path in specs --- spec/features/admin/enterprises/images_spec.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/spec/features/admin/enterprises/images_spec.rb b/spec/features/admin/enterprises/images_spec.rb index ea903b4151..31c0eca1ee 100644 --- a/spec/features/admin/enterprises/images_spec.rb +++ b/spec/features/admin/enterprises/images_spec.rb @@ -35,7 +35,7 @@ feature "Managing enterprise images" do go_to_images within ".page-admin-enterprises-form__logo-field-group" do - expect(page).to have_selector(".image-field-group__preview-image[src*='logo-white.png']") + expect_preview_image "logo-white.png" end # Replacing image @@ -46,7 +46,7 @@ feature "Managing enterprise images" do go_to_images within ".page-admin-enterprises-form__logo-field-group" do - expect(page).to have_selector(".image-field-group__preview-image[src*='logo-black.png']") + expect_preview_image "logo-black.png" end # Removing image @@ -71,7 +71,7 @@ feature "Managing enterprise images" do go_to_images within ".page-admin-enterprises-form__promo-image-field-group" do - expect(page).to have_selector(".image-field-group__preview-image[src*='logo-white.jpg']") + expect_preview_image "logo-white.jpg" end # Replacing image @@ -82,7 +82,7 @@ feature "Managing enterprise images" do go_to_images within ".page-admin-enterprises-form__promo-image-field-group" do - expect(page).to have_selector(".image-field-group__preview-image[src*='logo-black.jpg']") + expect_preview_image "logo-black.jpg" end # Removing image @@ -99,4 +99,8 @@ feature "Managing enterprise images" do end end end + + def expect_preview_image(file_name) + expect(page).to have_selector(".image-field-group__preview-image[src*='#{file_name}']") + end end From 65438e2619f301eed03696160154a82ff3f85590 Mon Sep 17 00:00:00 2001 From: Kristina Lim Date: Thu, 31 Jan 2019 05:04:18 +0800 Subject: [PATCH 3/3] Refactor checking no preview image in specs --- spec/features/admin/enterprises/images_spec.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/spec/features/admin/enterprises/images_spec.rb b/spec/features/admin/enterprises/images_spec.rb index 31c0eca1ee..110b8c2664 100644 --- a/spec/features/admin/enterprises/images_spec.rb +++ b/spec/features/admin/enterprises/images_spec.rb @@ -58,7 +58,7 @@ feature "Managing enterprise images" do expect(page).to have_content("Logo removed successfully") within ".page-admin-enterprises-form__logo-field-group" do - expect(page).to have_no_selector(".image-field-group__preview-image") + expect_no_preview_image end end @@ -94,7 +94,7 @@ feature "Managing enterprise images" do expect(page).to have_content("Promo image removed successfully") within ".page-admin-enterprises-form__promo-image-field-group" do - expect(page).to have_no_selector(".image-field-group__preview-image") + expect_no_preview_image end end end @@ -103,4 +103,8 @@ feature "Managing enterprise images" do def expect_preview_image(file_name) expect(page).to have_selector(".image-field-group__preview-image[src*='#{file_name}']") end + + def expect_no_preview_image + expect(page).to have_no_selector(".image-field-group__preview-image") + end end