diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 05285437c..3149fe884 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,10 +17,12 @@ jobs: strategy: fail-fast: false matrix: - ruby: [ jruby-9.3.10.0, jruby-9.4.2.0, ruby-3.1.4, ruby-3.2.2 ] - neo4j: [ 3.5.35, 4.0.12, 4.1.12, 4.2.19, 4.3.23, 4.4.19, 5.7.0 ] + ruby: [ jruby-9.4.3.0, ruby-3.1.4, ruby-3.2.2 ] + neo4j: [ 3.5.35, 4.0.12, 4.1.12, 4.2.19, 4.3.23, 4.4.26, 5.12.0 ] + active_model: [ 7.0, 7.1 ] env: NEO4J_VERSION: ${{ matrix.neo4j }} + ACTIVE_MODEL_VERSION: ${{ matrix.active_model }} JRUBY_OPTS: --debug -J-Xmx1280m -Xcompile.invokedynamic=false -J-XX:+TieredCompilation -J-XX:TieredStopAtLevel=1 -J-noverify -Xcompile.mode=OFF steps: - name: Start neo4j diff --git a/Gemfile b/Gemfile index bb211c357..f0c1230c3 100644 --- a/Gemfile +++ b/Gemfile @@ -4,7 +4,7 @@ gemspec # gem 'neo4j-ruby-driver', path: '../neo4j-ruby-driver' -gem 'listen', '< 3.1' +# gem 'listen', '< 3.1' active_model_version = ENV['ACTIVE_MODEL_VERSION'] gem 'activemodel', "~> #{active_model_version}" if active_model_version&.length&.positive? diff --git a/activegraph.gemspec b/activegraph.gemspec index d6c44ecb4..13158ac9e 100644 --- a/activegraph.gemspec +++ b/activegraph.gemspec @@ -31,10 +31,9 @@ DESCRIPTION } s.add_dependency('activemodel', '>= 4.0') - # s.add_dependency('activesupport', '>= 4.0') - s.add_dependency('activesupport', '>= 4.0', '< 7.1') + s.add_dependency('activesupport', '>= 4.0') s.add_dependency('i18n', '!= 1.8.8') # https://github.com/jruby/jruby/issues/6547 - s.add_dependency('neo4j-ruby-driver', '>= 5.13.0.alpha.3') + s.add_dependency('neo4j-ruby-driver', '< 5') s.add_dependency('orm_adapter', '>= 0.5.0') s.add_dependency('sorted_set') s.add_development_dependency('guard') @@ -48,6 +47,5 @@ DESCRIPTION s.add_development_dependency('rubocop', '>= 0.56.0') s.add_development_dependency('yard') s.add_development_dependency('dryspec') - # s.add_development_dependency('rspec', '< 3.10') # Cannot proxy frozen objects - s.add_development_dependency('rspec') # Cannot proxy frozen objects + s.add_development_dependency('rspec') end diff --git a/lib/active_graph/version.rb b/lib/active_graph/version.rb index 9a2bd53e2..800fc3e03 100644 --- a/lib/active_graph/version.rb +++ b/lib/active_graph/version.rb @@ -1,3 +1,3 @@ module ActiveGraph - VERSION = '11.4.0' + VERSION = '11.5.0.alpha.1' end diff --git a/spec/unit/node/validation_spec.rb b/spec/unit/node/validation_spec.rb index 4edf55022..c9bc1fd47 100644 --- a/spec/unit/node/validation_spec.rb +++ b/spec/unit/node/validation_spec.rb @@ -41,8 +41,8 @@ def self.fetch_upstream_primitive(_attr) o.serialized_properties allow(clazz).to receive(:default_property_values).and_return({}) expect(node).to receive(:properties).and_return(name: 'kalle2', age: '43') - expect(o).to receive(:_create_node).with(name: 'kalle', age: 42).and_return(node) - expect(o).to receive(:init_on_load).with(node, age: '43', name: 'kalle2') + expect(o).to receive(:_create_node).with({ name: 'kalle', age: 42 }).and_return(node) + expect(o).to receive(:init_on_load).with(node, { age: '43', name: 'kalle2' }) allow(Object).to receive(:serialized_properties_keys).and_return([]) expect(o.save).to be true end