Skip to content
Open
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
21 changes: 21 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---
name: Tests
on: [ push, pull_request ]
jobs:
test:
name: Test (Ruby ${{ matrix.ruby }}, Rails ${{ matrix.rails }})
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
ruby: [ '2.7', '3.0' ]
rails: [ '5.2', '6.0', '6.1' ]
env:
BUNDLE_GEMFILE: gemfiles/rails-${{ matrix.rails }}.gemfile
steps:
- uses: actions/checkout@v3
- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true
- run: bundle exec rake
4 changes: 2 additions & 2 deletions active_shipping.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ Gem::Specification.new do |s|


s.add_dependency("measured", ">= 2.0")
s.add_dependency("activesupport", ">= 4.2", "< 6.1")
s.add_dependency("activesupport", ">= 5.2", "< 6.2")
s.add_dependency("active_utils", "~> 3.3.1")
s.add_dependency("nokogiri", ">= 1.6")

s.add_development_dependency("minitest")
s.add_development_dependency("minitest", "~> 5.18.0")
s.add_development_dependency("minitest-reporters")
s.add_development_dependency("rake")
s.add_development_dependency("mocha", "~> 1")
Expand Down
5 changes: 0 additions & 5 deletions gemfiles/activesupport42.gemfile

This file was deleted.

6 changes: 0 additions & 6 deletions gemfiles/activesupport50.gemfile

This file was deleted.

5 changes: 0 additions & 5 deletions gemfiles/activesupport51.gemfile

This file was deleted.

5 changes: 0 additions & 5 deletions gemfiles/activesupport52.gemfile

This file was deleted.

5 changes: 0 additions & 5 deletions gemfiles/activesupport_master.gemfile

This file was deleted.

6 changes: 6 additions & 0 deletions gemfiles/rails-5.2.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
source "https://rubygems.org"

gem 'activesupport', '~> 5.2.0'
gem 'i18n'

gemspec path: '..'
6 changes: 6 additions & 0 deletions gemfiles/rails-6.0.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
source "https://rubygems.org"

gem 'activesupport', '~> 6.0.0'
gem 'i18n'

gemspec path: '..'
6 changes: 6 additions & 0 deletions gemfiles/rails-6.1.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
source "https://rubygems.org"

gem 'activesupport', '~> 6.1.0'
gem 'i18n'

gemspec path: '..'
4 changes: 2 additions & 2 deletions test/unit/carriers/usps_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -384,15 +384,15 @@ def test_package_valid_for_max_dimensions
end

def test_strip_9_digit_zip_codes
request = URI.decode(@carrier.send(:build_us_rate_request, package_fixtures[:book], "90210-1234", "123456789"))
request = CGI.unescape(@carrier.send(:build_us_rate_request, package_fixtures[:book], "90210-1234", "123456789"))
assert !(request =~ /\>90210-1234\</)
assert request =~ /\>90210\</
assert !(request =~ /\>123456789\</)
assert request =~ /\>12345\</
end

def test_strip_9_digit_zip_codes_world_rates
request = URI.decode(@carrier.send(:build_world_rate_request, location_fixtures[:beverly_hills_9_zip],
request = CGI.unescape(@carrier.send(:build_world_rate_request, location_fixtures[:beverly_hills_9_zip],
package_fixtures[:book], location_fixtures[:auckland], {}))
refute_match /\<OriginZip\>90210-1234/, request
assert_match /\<OriginZip\>90210/, request
Expand Down