From e7adbe720398cba9a7c5c6fcc0455623ccbe1911 Mon Sep 17 00:00:00 2001 From: Tobias Schoknecht Date: Thu, 20 Jun 2024 18:30:34 +0200 Subject: [PATCH 1/6] Fix default currency on transactions --- lib/sps_king/transaction.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/sps_king/transaction.rb b/lib/sps_king/transaction.rb index 68bcf01..4d2205f 100644 --- a/lib/sps_king/transaction.rb +++ b/lib/sps_king/transaction.rb @@ -43,7 +43,7 @@ def initialize(attributes = {}) self.requested_date ||= DEFAULT_REQUESTED_DATE self.reference ||= 'NOTPROVIDED' self.batch_booking = true if self.batch_booking.nil? - self.currency ||= 'EUR' + self.currency ||= 'CHF' end protected From ddfa5a1c452ba617e0e29e8c3db4152000f9d0be Mon Sep 17 00:00:00 2001 From: Tobias Schoknecht Date: Thu, 20 Jun 2024 18:32:52 +0200 Subject: [PATCH 2/6] Add newer ruby versions to test matrix --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6e73960..7932582 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: - ruby-version: ['3.0'] + ruby-version: ['3.0', '3.1', '3.2', '3.3'] gemfile: - gemfiles/Gemfile-activemodel-6.0.x - gemfiles/Gemfile-activemodel-6.1.x From 19f452fe71ab8022c7d839c5df46838cbcf52c9a Mon Sep 17 00:00:00 2001 From: Tobias Schoknecht Date: Thu, 20 Jun 2024 18:37:07 +0200 Subject: [PATCH 3/6] Improve test setup --- .github/workflows/test.yml | 23 ++++++++++++----------- gemfiles/Gemfile-activemodel-6.0.x | 5 ----- 2 files changed, 12 insertions(+), 16 deletions(-) delete mode 100644 gemfiles/Gemfile-activemodel-6.0.x diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7932582..19b299f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,21 +11,22 @@ jobs: runs-on: ubuntu-latest strategy: + fail-fast: false matrix: - ruby-version: ['3.0', '3.1', '3.2', '3.3'] - gemfile: - - gemfiles/Gemfile-activemodel-6.0.x - - gemfiles/Gemfile-activemodel-6.1.x - - gemfiles/Gemfile-activemodel-7.0.x - - gemfiles/Gemfile-activemodel-7.1.x + ruby: ['3.0', '3.1', '3.2', '3.3'] + rails: ['6.1', '7.0', '7.1'] + + name: Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }} + env: + BUNDLE_GEMFILE: gemfiles/Gemfile-activemodel-${{ matrix.rails }}.x steps: - uses: actions/checkout@v3 - - name: Set up Ruby ${{ matrix.ruby-version }} - uses: ruby/setup-ruby@359bebbc29cbe6c87da6bc9ea3bc930432750108 + + - name: Set up Ruby ${{ matrix.ruby }} + uses: ruby/setup-ruby@v1 with: - ruby-version: ${{ matrix.ruby-version }} - - name: Install dependencies for ${{ matrix.gemfile}} - run: bundle install --gemfile=${{ matrix.gemfile }} + ruby-version: ${{ matrix.ruby }} + - name: Run tests run: bundle exec rspec diff --git a/gemfiles/Gemfile-activemodel-6.0.x b/gemfiles/Gemfile-activemodel-6.0.x deleted file mode 100644 index ad46a64..0000000 --- a/gemfiles/Gemfile-activemodel-6.0.x +++ /dev/null @@ -1,5 +0,0 @@ -source 'https://rubygems.org' - -gemspec path: '..' - -gem 'activemodel', '~> 6.0.0' From 5de825448ce3cccd2bc7f0645067fb1db582fb4c Mon Sep 17 00:00:00 2001 From: Tobias Schoknecht Date: Thu, 20 Jun 2024 18:38:36 +0200 Subject: [PATCH 4/6] Fix indentation --- .github/workflows/test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 19b299f..d7a379e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,9 +16,9 @@ jobs: ruby: ['3.0', '3.1', '3.2', '3.3'] rails: ['6.1', '7.0', '7.1'] - name: Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }} - env: - BUNDLE_GEMFILE: gemfiles/Gemfile-activemodel-${{ matrix.rails }}.x + name: Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }} + env: + BUNDLE_GEMFILE: gemfiles/Gemfile-activemodel-${{ matrix.rails }}.x steps: - uses: actions/checkout@v3 From 275297d75facc2a652f559a12cb4b0a1c5abeac4 Mon Sep 17 00:00:00 2001 From: Tobias Schoknecht Date: Thu, 20 Jun 2024 18:40:57 +0200 Subject: [PATCH 5/6] Re-add bundle install step --- .github/workflows/test.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d7a379e..1e9303d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,8 +17,6 @@ jobs: rails: ['6.1', '7.0', '7.1'] name: Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }} - env: - BUNDLE_GEMFILE: gemfiles/Gemfile-activemodel-${{ matrix.rails }}.x steps: - uses: actions/checkout@v3 @@ -28,5 +26,8 @@ jobs: with: ruby-version: ${{ matrix.ruby }} + - name: Install dependencies for gemfiles/Gemfile-activemodel-${{ matrix.rails }} + run: bundle install --gemfile=gemfiles/Gemfile-activemodel-${{ matrix.rails }} + - name: Run tests run: bundle exec rspec From a24c037e61c5d3c2b2efffa399c4bf152e70468f Mon Sep 17 00:00:00 2001 From: Tobias Schoknecht Date: Thu, 20 Jun 2024 18:43:08 +0200 Subject: [PATCH 6/6] Revert to old gemfile definition --- .github/workflows/test.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 1e9303d..ef9ce9c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,9 +14,12 @@ jobs: fail-fast: false matrix: ruby: ['3.0', '3.1', '3.2', '3.3'] - rails: ['6.1', '7.0', '7.1'] + gemfile: + - gemfiles/Gemfile-activemodel-6.1.x + - gemfiles/Gemfile-activemodel-7.0.x + - gemfiles/Gemfile-activemodel-7.1.x - name: Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }} + name: Ruby ${{ matrix.ruby }} / Gemfile {{ matrix.gemfile }} steps: - uses: actions/checkout@v3 @@ -26,8 +29,8 @@ jobs: with: ruby-version: ${{ matrix.ruby }} - - name: Install dependencies for gemfiles/Gemfile-activemodel-${{ matrix.rails }} - run: bundle install --gemfile=gemfiles/Gemfile-activemodel-${{ matrix.rails }} + - name: Install dependencies for ${{ matrix.gemfile }} + run: bundle install --gemfile=${{ matrix.gemfile }} - name: Run tests run: bundle exec rspec