Fix Rubocop offenses

AlchemyCMS · May 21, 2020 · 3e10302 · 3e10302
1 parent 6c93e87
commit 3e10302
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/lib/alchemy/config.rb b/lib/alchemy/config.rb
@@ -66,6 +66,7 @@ def read_file(file)
       #
       def merge_configs!(*config_files)
         raise LoadError, "No Alchemy config file found!" if config_files.map(&:blank?).all?
+
         config = {}
         config_files.each { |h| config.merge!(h.stringify_keys!) }
         config

diff --git a/spec/libraries/config_spec.rb b/spec/libraries/config_spec.rb
@@ -128,7 +128,9 @@ module Alchemy
       context "when configs containing same keys" do
         it "should merge them together" do
           expect(Config.send(:merge_configs!, config_1, config_2)).to eq(
-            { "setting_1" => "same", "other_setting" => "something", "setting_2" => "anything" }
+            "setting_1" => "same",
+            "other_setting" => "something",
+            "setting_2" => "anything",
           )
         end
       end