From 46b019abd520870ab159b60c03c45675f64dd88a Mon Sep 17 00:00:00 2001 From: Teddy Wing Date: Sat, 29 Apr 2017 22:21:01 +0200 Subject: Rename database client classes Update our class names to reflect the new file structure introduced in b700c1bef89a67a64f1040fb6bb03c0320eefe91. Use the module DBShell module Client end end syntax intead of `DBShell::Client` so that we don't have to define the `Client` module in a separate file and require it. Otherwise we'd get an error: lib/dbshell/client/sqlite3.rb:1:in `': uninitialized constant DBShell::Client (NameError) --- spec/dbshell/client/database_spec.rb | 12 ++++++------ spec/dbshell/client/postgres_spec.rb | 4 ++-- spec/dbshell/client/sqlite3_spec.rb | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'spec/dbshell') diff --git a/spec/dbshell/client/database_spec.rb b/spec/dbshell/client/database_spec.rb index e08d810..5fe5597 100644 --- a/spec/dbshell/client/database_spec.rb +++ b/spec/dbshell/client/database_spec.rb @@ -1,23 +1,23 @@ require 'minitest/autorun' require 'dbshell/client/database' -describe DBShell::DatabaseClient do +describe DBShell::Client::Database do describe ".handler" do it "handles SQLite3" do - DBShell::DatabaseClient.handler({ + DBShell::Client::Database.handler({ 'adapter' => 'sqlite3' - }).must_equal(DBShell::Sqlite3Client) + }).must_equal(DBShell::Client::Sqlite3) end it "handles Postgres" do - DBShell::DatabaseClient.handler({ + DBShell::Client::Database.handler({ 'adapter' => 'postgresql' - }).must_equal(DBShell::PostgresClient) + }).must_equal(DBShell::Client::Postgres) end it "raises an error if no suitable adapter is found" do proc do - DBShell::DatabaseClient.handler({ + DBShell::Client::Database.handler({ 'adapter' => 'sybil_system' }) end.must_raise(DBShell::InvalidDatabaseAdapter) diff --git a/spec/dbshell/client/postgres_spec.rb b/spec/dbshell/client/postgres_spec.rb index c267ac0..c9cb2c7 100644 --- a/spec/dbshell/client/postgres_spec.rb +++ b/spec/dbshell/client/postgres_spec.rb @@ -1,10 +1,10 @@ require 'minitest/autorun' require 'dbshell/client/postgres' -describe DBShell::PostgresClient do +describe DBShell::Client::Postgres do describe ".build_command" do it "builds basic arguments" do - DBShell::PostgresClient.build_command({ + DBShell::Client::Postgres.build_command({ 'adapter' => 'postgresql', 'host' => 'mailmarehost', 'port' => 6027, diff --git a/spec/dbshell/client/sqlite3_spec.rb b/spec/dbshell/client/sqlite3_spec.rb index df42cbd..15d35a5 100644 --- a/spec/dbshell/client/sqlite3_spec.rb +++ b/spec/dbshell/client/sqlite3_spec.rb @@ -1,10 +1,10 @@ require 'minitest/autorun' require 'dbshell/client/sqlite3' -describe DBShell::Sqlite3Client do +describe DBShell::Client::Sqlite3 do describe ".build_command" do it "builds basic arguments" do - DBShell::Sqlite3Client.build_command({ + DBShell::Client::Sqlite3.build_command({ 'adapter' => 'sqlite3', 'database' => 'db/development.sqlite3' }).must_equal([ -- cgit v1.2.3