From a38699e0e70f1e68111d258305b30f30b9967b34 Mon Sep 17 00:00:00 2001
From: Tim Zallmann <tzallmann@gitlab.com>
Date: Thu, 20 Aug 2020 07:36:28 +0200
Subject: [PATCH] Updated use_startup_css to check if we are in Test
---
app/helpers/application_helper.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 500905fd3c833..41b20a1d9a07f 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -236,11 +236,11 @@ def page_filter_path(options = {})
end
def use_startup_css?
- Feature.enabled?(:startup_css)
+ Feature.enabled?(:startup_css) && !Rails.env.test?
end
def stylesheet_link_tag_defer(path)
- if use_startup_css? && !Rails.env.test?
+ if use_startup_css?
stylesheet_link_tag(path, media: "print")
else
stylesheet_link_tag(path, media: "all")
--
GitLab