attempting to fix specs, removed duplicated block in specs, updates .…

…travis.yml
neo4jrb · Jun 29, 2017 · 025b171 · 025b171
1 parent 255a773
commit 025b171
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 38 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,12 @@
 before_script:
   - "bin/rake neo4j:install[$NEO4J_VERSION] --trace"
   - "bin/rake neo4j:config[development,7474] --trace"
+  - "if [ -f ./db/neo4j/development/conf/neo4j-wrapper.conf ]; then WRAPPER=-wrapper; fi"
   - "echo 'dbms.memory.pagecache.size=1g' >> ./db/neo4j/development/conf/neo4j.conf"
-  - "echo 'dbms.memory.heap.max_size=1000' >> ./db/neo4j/development/conf/neo4j-wrapper.conf"
-  - "echo 'dbms.memory.heap.initial_size=1000' >> ./db/neo4j/development/conf/neo4j-wrapper.conf"
+  - "echo 'dbms.memory.heap.max_size=1000' >> ./db/neo4j/development/conf/neo4j$WRAPPER.conf"
+  - "echo 'dbms.memory.heap.initial_size=1000' >> ./db/neo4j/development/conf/neo4j$WRAPPER.conf"
   - "bin/rake neo4j:start --trace"
-  - "sleep 10"
+  - "sleep 20"
 script:
   - "bundle exec rspec $RSPEC_OPTS"
 language: ruby
@@ -15,15 +16,14 @@ jdk: oraclejdk8
 rvm:
   - 2.3.1
   - 2.2.5
-  - jruby-9.0.4.0
+  - jruby-9.1.12.0
 env:
   global:
     - JRUBY_OPTS="-J-Xmx1024m -Xcompile.invokedynamic=false -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-noverify -Xcompile.mode=OFF"
     - NEO4J_URL="http://localhost:7474"
     - NEO4J_BOLT_URL="bolt://localhost:7472"
   matrix:
-    - NEO4J_VERSION=community-3.1.2
-    - NEO4J_VERSION=community-3.0.9
+    - NEO4J_VERSION=community-3.2.1
 matrix:
   include:
     - script: "bundle exec rubocop"
@@ -34,25 +34,24 @@ matrix:
 
     # Older versions of Neo4j with latest version of Ruby
     - rvm: 2.3.1
-      env: NEO4J_VERSION=community-3.0.9
+      env: NEO4J_VERSION=community-3.1.5
     - rvm: 2.3.1
-      env: NEO4J_VERSION=community-2.3.9
-    - rvm: 2.3.1
-      env: NEO4J_VERSION=community-2.2.10
+      env: NEO4J_VERSION=community-2.3.11
     - rvm: 2.3.1
       env: NEO4J_VERSION=community-2.1.8
 
     # Older versions of Neo4j with latest version of jRuby
-    - rvm: jruby-9.0.4.0
-      env: NEO4J_VERSION=community-3.0.9
-    - rvm: jruby-9.0.4.0
-      env: NEO4J_VERSION=community-2.3.9
-    - rvm: jruby-9.0.4.0
-      env: NEO4J_VERSION=community-2.2.10
-    - rvm: jruby-9.0.4.0
+    - rvm: jruby-9.1.12.0
+      env: NEO4J_VERSION=community-3.1.5
+    - rvm: jruby-9.1.12.0
+      env: NEO4J_VERSION=community-2.3.11
+    - rvm: jruby-9.1.12.0
       env: NEO4J_VERSION=community-2.1.8
 
     # NEW_NEO4J_SESSIONS
-    - rvm: jruby-9.0.4.0
-      env: RSPEC_OPTS="--tag new_cypher_session" NEO4J_VERSION=community-2.3.5 NEW_NEO4J_SESSIONS=true
+    - rvm: jruby-9.1.12.0
+      env: RSPEC_OPTS="--tag new_cypher_session" NEO4J_VERSION=community-2.3.11 NEW_NEO4J_SESSIONS=true
 
+    # Enterprise
+    - rvm: 2.3.1
+      env: NEO4J_VERSION=enterprise-3.2.1
diff --git a/spec/neo4j-core/unit/query_spec.rb b/spec/neo4j-core/unit/query_spec.rb
@@ -415,25 +415,6 @@ def self.it_generates(cypher, params = {})
                    q_created_at_range_min: Date.new(2017, 6, 1),
                    q_created_at_range_max: Date.new(2017, 6, 3)
     end
-
-    # Non-integer ranges
-    describe '.where(q: { created_at: 0.0...5.0 })' do
-      it_generates 'WHERE (q.created_at >= {q_created_at_range_min} AND q.created_at < {q_created_at_range_max})',
-        q_created_at_range_min: 0.0,
-        q_created_at_range_max: 5.0
-    end
-
-    describe '.where(q: { created_at: Date.new(2017, 6, 1)...Date.new(2017, 6, 3) })' do
-      it_generates 'WHERE (q.created_at >= {q_created_at_range_min} AND q.created_at < {q_created_at_range_max})',
-        q_created_at_range_min: Date.new(2017, 6, 1),
-        q_created_at_range_max: Date.new(2017, 6, 3)
-    end
-
-    describe '.where(q: { created_at: Date.new(2017, 6, 1)..Date.new(2017, 6, 3) })' do
-      it_generates 'WHERE (q.created_at >= {q_created_at_range_min} AND q.created_at <= {q_created_at_range_max})',
-        q_created_at_range_min: Date.new(2017, 6, 1),
-        q_created_at_range_max: Date.new(2017, 6, 3)
-    end
   end
 
   describe '#where_not' do