diff --git a/app/views/layouts/_common_head.html.erb b/app/views/layouts/_common_head.html.erb index 44bf54a2c..ef2f8e6f5 100644 --- a/app/views/layouts/_common_head.html.erb +++ b/app/views/layouts/_common_head.html.erb @@ -6,3 +6,4 @@ <%= javascript_include_tag "application", 'data-turbolinks-track' => true %> <%= csrf_meta_tags %> <%= favicon_link_tag "favicon.ico" %> +<%= render "layouts/no_animations_in_tests" if Rails.env.test? %> diff --git a/app/views/layouts/_no_animations_in_tests.html.erb b/app/views/layouts/_no_animations_in_tests.html.erb new file mode 100644 index 000000000..306e16f28 --- /dev/null +++ b/app/views/layouts/_no_animations_in_tests.html.erb @@ -0,0 +1 @@ +<%= javascript_tag "jQuery.fx.off = true" %> diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb index 2baf7d3ae..c19d2ac99 100644 --- a/app/views/layouts/admin.html.erb +++ b/app/views/layouts/admin.html.erb @@ -4,7 +4,6 @@
<%= render "layouts/common_head", default_title: "Admin" %> <%= content_for :head %> - <%= javascript_tag "jQuery.fx.off = true" if Rails.env.test? %>