From ac27bdce14e4d57bbb524d45a67b13e639f6a79c Mon Sep 17 00:00:00 2001
From: Gerhard Schlager <mail@gerhard-schlager.at>
Date: Tue, 16 Apr 2019 11:41:14 +0200
Subject: [PATCH] DEV: Prevent warnings in specs
---
lib/js_locale_helper.rb | 2 +-
spec/requests/theme_javascripts_controller_spec.rb | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/js_locale_helper.rb b/lib/js_locale_helper.rb
index 8628759b1e6..4fd5ab1c749 100644
--- a/lib/js_locale_helper.rb
+++ b/lib/js_locale_helper.rb
@@ -162,7 +162,7 @@ module JsLocaleHelper
result
end
- MOMENT_LOCALE_MAPPING = {
+ MOMENT_LOCALE_MAPPING ||= {
"hy" => "hy-am"
}
diff --git a/spec/requests/theme_javascripts_controller_spec.rb b/spec/requests/theme_javascripts_controller_spec.rb
index ac9475c1664..57a415e7c72 100644
--- a/spec/requests/theme_javascripts_controller_spec.rb
+++ b/spec/requests/theme_javascripts_controller_spec.rb
@@ -49,7 +49,9 @@ describe ThemeJavascriptsController do
end
def clear_disk_cache
- `rm #{ThemeJavascriptsController::DISK_CACHE_PATH}/*`
+ if Dir.exist?(ThemeJavascriptsController::DISK_CACHE_PATH)
+ `rm #{ThemeJavascriptsController::DISK_CACHE_PATH}/*`
+ end
end
end
end