time_series_spec.rb in riak-client-2.4.0.pre1

- old
+ new

@@ -3,11 +3,12 @@
 
 describe 'Time Series',
          test_client: true, integration: true, time_series: true do
   let(:table_name){ 'GeoCheckin' }
 
-  let(:now){ Time.at(Time.now.to_i) }
+  let(:now_ts) { Time.now.to_i }
+  let(:now){ Time.at(now_ts) }
   let(:five_minutes_ago){ now - 300 }
   let(:now_range_str) do
     past = (now.to_i - 100) * 1000
     future = (now.to_i + 100) * 1000
     "time > #{ past } AND time < #{ future }"
@@ -16,20 +17,21 @@
     range_start = '1'
     range_end = '2'
     "time > #{range_start} AND time < #{range_end}"
   end
 
-  let(:family){ 'family-' + random_key }
-  let(:series){ 'series-' + random_key }
+  let(:family){ 'geohash-' + random_key }
+  let(:series){ 'user-' + random_key }
 
   let(:key){ [family, series, now] }
+  let(:key_ts){ [family, series, now_ts * 1000] }
   let(:key2){ [family, series, five_minutes_ago] }
   let(:datum){ [*key, 'cloudy', 27.1] }
   let(:datum_null){ [*key2, 'cloudy', nil] }
 
   let(:family_series_str) do
-    "myfamily = '#{family}' AND myseries = '#{series}'"
+    "geohash = '#{family}' AND user = '#{series}'"
   end
 
   let(:query) do
     <<-SQL
 SELECT * FROM #{table_name}
@@ -190,11 +192,11 @@
       expect(found_expectation).to receive(:found!).once
 
       lister = Riak::TimeSeries::List.new test_client, table_name
 
       lister.issue! do |row|
-        found_expectation.found! if row.to_a == key
+        found_expectation.found! if row.to_a == key_ts
       end
     end
 
     it 'returns a list of keys without a block' do
       stored_datum_expectation
@@ -202,9 +204,9 @@
 
       lister = Riak::TimeSeries::List.new test_client, table_name
 
       results = lister.issue!
 
-      expect(results).to include key
+      expect(results).to include key_ts
     end
   end
 end