Cleanup for #307

hanami · Mar 26, 2016 · e126108 · e126108
1 parent 2e1cc5e
commit e126108
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/lib/hanami/model/config/adapter.rb b/lib/hanami/model/config/adapter.rb
@@ -8,7 +8,7 @@ module Config
       # @since 0.2.0
       class AdapterNotFound < Hanami::Model::Error
         def initialize(adapter_name, message)
-          super "Cannot find Hanami::Model adapter '#{adapter_name}' (#{message})"
+          super "Cannot find Hanami::Model adapter `Hanami::Model::Adapters::#{adapter_name}' (#{message})"
         end
       end
 
@@ -104,7 +104,7 @@ def instantiate_adapter(mapper)
             klass = Hanami::Utils::Class.load!(class_name, Hanami::Model::Adapters)
             klass.new(mapper, uri, options)
           rescue => e
-            raise Error, e
+            raise Hanami::Model::Error.new(e)
           end
         end
       end

diff --git a/test/model/config/adapter_test.rb b/test/model/config/adapter_test.rb
@@ -37,7 +37,8 @@
       let(:config) { Hanami::Model::Config::Adapter.new(type: :redis, uri: 'redis://not_exist') }
 
       it 'raises an error' do
-        -> { config.build(mapper) }.must_raise(Hanami::Model::Error)
+        exception = -> { config.build(mapper) }.must_raise(Hanami::Model::Error)
+        exception.message.must_equal "Cannot find Hanami::Model adapter `Hanami::Model::Adapters::RedisAdapter' (cannot load such file -- hanami/model/adapters/redis_adapter)"
       end
     end
 
@@ -46,7 +47,8 @@
 
       it 'raises an error' do
         config.stub(:load_adapter, nil) do
-          -> { config.build(mapper) }.must_raise(Hanami::Model::Error)
+          exception = -> { config.build(mapper) }.must_raise(Hanami::Model::Error)
+          exception.message.must_equal "uninitialized constant Hanami::Model::Adapters::RedisAdapter"
         end
       end
     end