Merge pull request #2967 from consul/backport-1609-fix_skip_flaky_specs

Fix flaky spec: Admin feature flags Enable a disabled feature

spec/shared/features/nested_imageable.rb

@@ -175,15 +175,14 @@
     end
 
     scenario "Should show successful notice when resource filled correctly without any nested images", :js do
-      login_as user
-      visit send(path, arguments)
-
-      send(fill_resource_method_name) if fill_resource_method_name
-      click_on submit_button
-
       if has_many_images
          skip "no need to test, there are no attributes for the parent resource"
       else
+        login_as user
+        visit send(path, arguments)
+
+        send(fill_resource_method_name) if fill_resource_method_name
+        click_on submit_button
         expect(page).to have_content imageable_success_notice
       end
     end