Supports cassanity 0.6.x.beta

jnunemaker · Dec 3, 2013 · 857f8f6 · 857f8f6
1 parent 0061d66
commit 857f8f6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/adapter-cassanity.gemspec b/adapter-cassanity.gemspec
@@ -18,5 +18,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency 'adapter', '~> 0.7.0'
-  gem.add_dependency 'cassanity', '~> 0.4'
+  gem.add_dependency 'cassanity', '< 0.7', '>=0.6.0.beta1' # change to ~>0.6 when 0.6.0 final drops
 end
diff --git a/spec/helper.rb b/spec/helper.rb
@@ -19,16 +19,11 @@
 COLUMN_FAMILIES = {}
 
 cassandra_setup = lambda { |args|
-  host          = ENV.fetch('CASSANDRA_HOST', '127.0.0.1:9160')
+  host          = ENV.fetch('CASSANDRA_HOST', '127.0.0.1')
+  port          = ENV.fetch('CASSANDRA_PORT', '9042').to_i
   keyspace_name = ENV.fetch('CASSANDRA_KEYSPACE_NAME', 'adapter_cassanity')
-  client        = CassandraCQL::Database.new(host, cql_version: '3.0.0')
-  executor      = Cassanity::Executors::CassandraCql.new({
-    client: client, # cassanity 0.4.0 wants this
-    driver: client, # cassanity 0.5.0 wants this
-    logger: logger,
-  })
-  connection    = Cassanity::Connection.new(executor: executor)
-  keyspace      = connection.keyspace(keyspace_name)
+  client        = Cassanity::Client.new([host], port)
+  keyspace      = client.keyspace(keyspace_name)
   keyspace.recreate
 
   COLUMN_FAMILIES[:single] = keyspace.column_family(:single, {