Merge pull request #429 from BBC-News/issue405

fix #405
bbc · May 16, 2016 · b578306 · b578306
2 parents e72b7a3 + 0a3c1ed
commit b578306
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/lib/wraith/helpers/custom_exceptions.rb b/lib/wraith/helpers/custom_exceptions.rb
@@ -6,3 +6,6 @@ class InvalidDomainsError < CustomError
 
 class MissingRequiredPropertyError < CustomError
 end
+
+class ConfigFileDoesNotExistError < CustomError
+end
diff --git a/lib/wraith/version.rb b/lib/wraith/version.rb
@@ -1,3 +1,3 @@
 module Wraith
-  VERSION = "3.1.6"
+  VERSION = "3.1.7"
 end
diff --git a/lib/wraith/wraith.rb b/lib/wraith/wraith.rb
@@ -26,8 +26,7 @@ def open_config_file(config_name)
         return YAML.load config
       end
     end
-  rescue
-    logger.error "unable to find config \"#{config_name}\""
+    fail ConfigFileDoesNotExistError, "unable to find config \"#{config_name}\""
   end
 
   def directory

diff --git a/spec/validate_spec.rb b/spec/validate_spec.rb
@@ -26,6 +26,10 @@
       config["browser"] = nil
       expect { Wraith::Validate.new(config, true).validate }.to raise_error MissingRequiredPropertyError
     end
+
+    it "should complain if the config file doesn't exist" do
+      expect { Wraith::Wraith.new('configs/some_made_up_config.yml') }.to raise_error ConfigFileDoesNotExistError
+    end
   end
 
   describe "validation specific to capture mode" do
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,3 +6,6 @@ class InvalidDomainsError < CustomError @@
     class MissingRequiredPropertyError < CustomError
     end
+    class ConfigFileDoesNotExistError < CustomError
+    end