Skip to content

Commit

Permalink
all specs passing
Browse files Browse the repository at this point in the history
  • Loading branch information
klobuczek committed Oct 19, 2023
1 parent 09eccd4 commit b87ea9d
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down
8 changes: 3 additions & 5 deletions activegraph.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand All @@ -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
2 changes: 1 addition & 1 deletion lib/active_graph/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module ActiveGraph
VERSION = '11.4.0'
VERSION = '11.5.0.alpha.1'
end
4 changes: 2 additions & 2 deletions spec/unit/node/validation_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b87ea9d

Please sign in to comment.