Skip to content

Commit

Permalink
Fix build errors introduced by e6e425f
Browse files Browse the repository at this point in the history
  • Loading branch information
jodosha committed Apr 4, 2016
1 parent e6e425f commit f952fa4
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 5 deletions.
8 changes: 7 additions & 1 deletion lib/hanami/model/adapters/abstract.rb
Expand Up @@ -89,6 +89,12 @@ def method_missing(method_name, *)
#
# @since 0.1.0
class Abstract
# @since x.x.x
# @api private
#
# @see Hanami::Model::Adapters::Abstract#adapter_name
ADAPTER_NAME_SUFFIX = '_adapter'.freeze

# Initialize the adapter
#
# @param mapper [Hanami::Model::Mapper] the object that defines the
Expand Down Expand Up @@ -295,7 +301,7 @@ def disconnect
#
# @since x.x.x
def adapter_name
Utils::String.new(self.class.name).demodulize.underscore.to_s
Utils::String.new(self.class.name).demodulize.underscore.to_s.sub(ADAPTER_NAME_SUFFIX, '')
end

private
Expand Down
6 changes: 3 additions & 3 deletions test/integration/repository_test.rb
Expand Up @@ -10,7 +10,7 @@
let(:article3) { Article.new(user_id: user2.id, title: 'Love Relationships', comments_count: '4') }

{
memory: [Hanami::Model::Adapters::MemoryAdapter, nil, MAPPER],
memory: [Hanami::Model::Adapters::MemoryAdapter, MEMORY_CONNECTION_STRING, MAPPER],
file_system: [Hanami::Model::Adapters::FileSystemAdapter, FILE_SYSTEM_CONNECTION_STRING, MAPPER],
sqlite: [Hanami::Model::Adapters::SqlAdapter, SQLITE_CONNECTION_STRING, MAPPER],
postgres: [Hanami::Model::Adapters::SqlAdapter, POSTGRES_CONNECTION_STRING, MAPPER],
Expand Down Expand Up @@ -611,8 +611,8 @@ def updated_at

describe "with memory adapter" do
before do
UserRepository.adapter = Hanami::Model::Adapters::MemoryAdapter.new(MAPPER, nil)
ArticleRepository.adapter = Hanami::Model::Adapters::MemoryAdapter.new(MAPPER, nil)
UserRepository.adapter = Hanami::Model::Adapters::MemoryAdapter.new(MAPPER, MEMORY_CONNECTION_STRING)
ArticleRepository.adapter = Hanami::Model::Adapters::MemoryAdapter.new(MAPPER, MEMORY_CONNECTION_STRING)

UserRepository.collection = :users
ArticleRepository.collection = :articles
Expand Down
6 changes: 6 additions & 0 deletions test/model/adapters/file_system_adapter_test.rb
Expand Up @@ -1175,5 +1175,11 @@ class TestDeviceRepository
exception = -> { @adapter.create(collection, TestUser.new) }.must_raise Hanami::Model::Adapters::DisconnectedAdapterError
exception.message.must_match "You have tried to perform an operation on a disconnected adapter"
end

describe '#adapter_name' do
it "equals to 'file_system'" do
@adapter.adapter_name.must_equal 'file_system'
end
end
end
end
8 changes: 7 additions & 1 deletion test/model/adapters/memory_adapter_test.rb
Expand Up @@ -34,7 +34,7 @@ class TestDeviceRepository
end
end.load!

@adapter = Hanami::Model::Adapters::MemoryAdapter.new(@mapper)
@adapter = Hanami::Model::Adapters::MemoryAdapter.new(@mapper, MEMORY_CONNECTION_STRING)
end

after do
Expand Down Expand Up @@ -1218,5 +1218,11 @@ class TestDeviceRepository
exception.message.must_match "You have tried to perform an operation on a disconnected adapter"
end
end

describe '#adapter_name' do
it "equals to 'memory'" do
@adapter.adapter_name.must_equal 'memory'
end
end
end
end
6 changes: 6 additions & 0 deletions test/model/adapters/sql_adapter_test.rb
Expand Up @@ -1392,5 +1392,11 @@ class TestCountryRepository
exception.message.must_match "You have tried to perform an operation on a disconnected adapter"
end
end

describe '#adapter_name' do
it "equals to 'sql'" do
@adapter.adapter_name.must_equal 'sql'
end
end
end
end
1 change: 1 addition & 0 deletions test/test_helper.rb
Expand Up @@ -50,6 +50,7 @@
POSTGRES_CONNECTION_STRING = "postgres://localhost/#{ postgres_database }"
end

MEMORY_CONNECTION_STRING = "memory://test"
FILE_SYSTEM_CONNECTION_STRING = "file:///#{ filesystem }"

if ENV['TRAVIS'] == 'true'
Expand Down

0 comments on commit f952fa4

Please sign in to comment.