spec/support/cassanity_helpers.rb in cassanity-0.5.1 vs spec/support/cassanity_helpers.rb in cassanity-0.6.0.beta1

@@ -1,25 +1,27 @@
 module CassanityHelpers
   def driver_keyspace?(driver, name)
-    driver.keyspaces.map(&:name).include?(name.to_s)
+    rows = driver.execute("SELECT keyspace_name FROM system.schema_keyspaces WHERE keyspace_name='#{name}' ALLOW FILTERING")
+    rows.to_a.any?
   end
 
   def driver_create_keyspace(driver, name)
     unless driver_keyspace?(driver, name)
-      driver.execute("CREATE KEYSPACE #{name} WITH strategy_class = 'SimpleStrategy' AND strategy_options:replication_factor = 1")
+      driver.execute("CREATE KEYSPACE #{name} WITH REPLICATION = { 'class': 'SimpleStrategy', 'replication_factor': 1 }")
     end
-    driver.execute("USE #{name}")
+    driver.use(name)
   end
 
   def driver_drop_keyspace(driver, name)
     if driver_keyspace?(driver, name)
       driver.execute("DROP KEYSPACE #{name}")
     end
   end
 
   def driver_column_family?(driver, name)
-    driver.schema.column_family_names.include?(name.to_s)
+    rows = driver.execute("SELECT columnfamily_name FROM system.schema_columnfamilies WHERE keyspace_name='#{driver.keyspace}' AND columnfamily_name='#{name}' ALLOW FILTERING")
+    rows.to_a.any?
   end
 
   def driver_create_column_family(driver, name, columns = nil)
     columns ||= "id text PRIMARY KEY, name text"
     unless driver_column_family?(driver, name)
@@ -32,8 +34,8 @@
       driver.execute("DROP COLUMNFAMILY #{name}")
     end
   end
 
   def cassandra_error(err)
-    CassandraCQL::Error::InvalidRequestException.new(err)
+    Cql::CqlError.new(err)
   end
 end