Merge pull request #3412 from kristinalim/fix/3059-race_condition_in_enterprise_image_specs

3059 [Flaky Spec] Fix race condition in enterprise image feature specs
This commit is contained in:
Luis Ramos
2019-02-03 19:32:11 +00:00
committed by GitHub

View File

@@ -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_preview_image "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_preview_image "logo-black.png"
end
# Removing image
@@ -60,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
@@ -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_preview_image "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_preview_image "logo-black.jpg"
end
# Removing image
@@ -98,9 +94,17 @@ 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
end
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