Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/specs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,4 @@ jobs:
run: while [ $((curl localhost:7474/ > /dev/null 2>&1); echo $?) -ne 0 ]; do sleep 1; done

- name: Run tests
run: bundle exec rspec -t ~csv -t ~causal
run: bundle exec rspec -t ~csv
6 changes: 3 additions & 3 deletions .github/workflows/testkit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
fail-fast: false
matrix:
ruby:
- [jruby, 9.4-jdk17]
- [jruby, latest]
- [ruby, latest]
tests:
- TESTKIT_TESTS
Expand All @@ -43,7 +43,7 @@ jobs:
with:
repository: neo4j-drivers/testkit
path: testkit
ref: '5.0'
ref: '6.x'

- name: Install dependencies
run: |
Expand Down Expand Up @@ -82,5 +82,5 @@ jobs:
if: failure()
uses: actions/upload-artifact@v4
with:
name: artifacts ${{ matrix.ruby[0] }}
name: artifacts ${{ matrix.ruby[0] }} ${{ matrix.tests }}
path: ${{ github.workspace }}/testkit/artifacts
7 changes: 1 addition & 6 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ end.spec 'neo4j-ruby-driver' do
active_support_version = ENV['ACTIVE_SUPPORT_VERSION']
dependency 'activesupport', active_support_version&.length&.positive? ? "~> #{active_support_version}" : '>= 7.1'
# dependency 'async-rspec', '>= 0', :dev
dependency 'pry', '>= 0', :dev
dependency 'csv', '>= 3.0'
dependency 'ffaker', '>= 0', :dev
dependency 'hoe', '>= 0', :dev
dependency 'hoe-bundler', '>= 0', :dev
Expand All @@ -34,7 +34,6 @@ end.spec 'neo4j-ruby-driver' do
dependency 'rspec-mocks', '>= 0', :dev
dependency 'zeitwerk', '>= 2.1.10'


spec_extras[:require_paths] = ['lib', jruby? ? 'jruby' : 'ruby']

self.clean_globs += %w[Gemfile Gemfile.lock *.gemspec lib/org lib/*_jars.rb]
Expand All @@ -53,10 +52,6 @@ end.spec 'neo4j-ruby-driver' do
dependency 'async', ['>= 2.13', '< 2.24']
dependency 'async-io', '>= 0'
dependency 'connection_pool', '>= 0'

if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.4')
dependency "csv", "~> 3.0" # CSV stdlib was moved in Ruby 3.4 to separate gem
end
end
end

Expand Down
235 changes: 0 additions & 235 deletions spec/integration/causal_clustering_spec.rb

This file was deleted.

2 changes: 1 addition & 1 deletion spec/integration/load_csv_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

RSpec.describe 'LoadCsv', csv: true do
let(:iris_class_names) { %w[Iris-setosa Iris-versicolor Iris-virginica] }
let(:file) { Tempfile.new('', '/tmp') }
let(:file) { Tempfile.new('', 'tmp') }
let(:file_path) { file.path }
let(:iris_data) do
%w[sepal_length,sepal_width,petal_length,petal_width,class_name
Expand Down
1 change: 0 additions & 1 deletion spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
require 'rspec/its'
require 'support/driver_helper'
require 'support/neo4j_cleaner'
require 'pry'

RSpec.configure do |config|
# Enable flags like --only-failures and --next-failure
Expand Down
2 changes: 1 addition & 1 deletion testkit-backend/lib/testkit/backend/messages/response.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def self.named_entity(name, **hash)
end
end

def value_entity(name, object)
def self.value_entity(name, object)
named_entity(name, value: object)
end
end
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module Testkit::Backend::Messages
module Responses
class Record < Response
def data = { values: @object.values.map(&method(:to_testkit)) }
def data = { values: @object.values.map(&self.class.method(:to_testkit)) }
end
end
end
Loading