From 47cbdbbca84dddb37b5266f454128558dfaa303e Mon Sep 17 00:00:00 2001 From: Hermann Mayer Date: Thu, 30 Jan 2025 10:18:53 +0100 Subject: [PATCH 1/2] Added all versions up to Ruby 3.4 to the CI matrix. Signed-off-by: Hermann Mayer --- .github/workflows/test.yml | 2 +- CHANGELOG.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index cc761b3..7246d7b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - ruby: ['2.7', '3.0', '3.1'] + ruby: ['2.7', '3.0', '3.1', '3.2', '3.3', '3.4'] rails: ['6.1', '7.1'] env: BUNDLE_GEMFILE: 'gemfiles/rails_${{ matrix.rails }}.gemfile' diff --git a/CHANGELOG.md b/CHANGELOG.md index 4528fa4..cb7df9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ ### next -* TODO: Replace this bullet point with an actual description of a change. +* Added all versions up to Ruby 3.4 to the CI matrix (#9) ### 1.5.1 (17 January 2025) From 2f46e0065ed08a284708a6d7b29f09eac5426937 Mon Sep 17 00:00:00 2001 From: Hermann Mayer Date: Thu, 30 Jan 2025 10:49:07 +0100 Subject: [PATCH 2/2] one of many Signed-off-by: Hermann Mayer --- spec/boltless/result_row_spec.rb | 16 ++++++++-------- spec/boltless/result_spec.rb | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/spec/boltless/result_row_spec.rb b/spec/boltless/result_row_spec.rb index fbb6e0f..af1b174 100644 --- a/spec/boltless/result_row_spec.rb +++ b/spec/boltless/result_row_spec.rb @@ -100,12 +100,12 @@ end it 'includes the values' do - expect(action).to include('values=[{:name=>"Klaus"}]') + expect(action).to include(/values=\[{:?name(=>|: )"Klaus"}\]/) end it 'includes the meta' do - expect(action).to \ - include('meta=[{:id=>146, :type=>"node", :deleted=>false}]') + parts = [':?id(=>|: )146', ':?type(=>|: )"node"', ':?deleted(=>|: )false'] + expect(action).to include(/meta=\[{#{parts.join(', ')}}\]/) end it 'includes the graph' do @@ -143,18 +143,18 @@ let(:input) { raw_result_fixture(:with_graph_result) } it 'includes the graph (key)' do - expect(action).to include('graph={:nodes=>') + expect(action).to include(/graph={:?nodes(=>|: )/) end it 'includes the graph (nodes)' do - expect(action).to \ - include('[{:id=>"149", :labels=>["User"], ' \ - ':properties=>{:name=>"Kalle"}}]') + parts = [':?id(=>|: )"149"', ':?labels(=>|: )\["User"\]', + ':?properties(=>|: ){:?name(=>|: )"Kalle"}'] + expect(action).to include(/\[{#{parts.join(', ')}}\]/) end it 'includes the graph (relationships)' do expect(action).to \ - include(':relationships=>[]') + include(/:?relationships(=>|: )\[\]/) end end end diff --git a/spec/boltless/result_spec.rb b/spec/boltless/result_spec.rb index 4cc40b0..0d034c1 100644 --- a/spec/boltless/result_spec.rb +++ b/spec/boltless/result_spec.rb @@ -99,7 +99,7 @@ end it 'includes the stats' do - expect(action).to include('stats={:contains_updates=>true') + expect(action).to include(/stats={:?contains_updates(=>|: )true/) end end