Skip to content

Commit 6930425

Browse files
authored
Support rails 7.1 (#169)
* Support rails 7.1 - clean up Github Action workflow file - allow rails 7.1.x - run tests with ruby 3.0, 3.1 and 3.2 * fix casing in Minitest constant
1 parent 161f87b commit 6930425

File tree

6 files changed

+37
-19
lines changed

6 files changed

+37
-19
lines changed

.github/workflows/build.yml

Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,27 @@ jobs:
1616
fail-fast: false
1717
matrix:
1818
ruby:
19-
- 2.7
20-
- 2.6
19+
- '2.7'
20+
- '3.0'
21+
- '3.1'
22+
- '3.2'
2123
gemfile:
22-
- rails_5.0.gemfile
23-
- rails_5.0_sprockets4.gemfile
24-
- rails_5.2.gemfile
25-
- rails_5.2_sprockets4.gemfile
26-
- rails_6.0.gemfile
27-
- rails_6.1.gemfile
28-
- rails_7.0.gemfile
29-
#- rails_head.gemfile
30-
#- rails_head_sprockets4.gemfile
31-
exclude:
32-
- gemfile: rails_7.0.gemfile
33-
ruby: 2.6
24+
- rails_6.0
25+
- rails_6.1
26+
- rails_7.0
27+
- rails_7.1
28+
include:
29+
- gemfile: rails_5.0
30+
ruby: '2.6'
31+
- gemfile: rails_5.0_sprockets4
32+
ruby: '2.6'
33+
- gemfile: rails_5.2
34+
ruby: '2.7'
35+
- gemfile: rails_5.2_sprockets4
36+
ruby: '2.7'
37+
3438
env:
35-
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}
39+
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile
3640
AWS_REGION: us-east1
3741
steps:
3842
- uses: actions/checkout@v2

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
### [Unreleased]
44

5+
### 1.2.1
6+
7+
- Support Rails 7.1
8+
59
### 1.2.0
610

711
- Support Rails 7

angular-rails-templates.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
1616

1717
s.require_paths = ["lib"]
1818

19-
s.add_dependency "railties", ">= 5.0", "< 7.1"
19+
s.add_dependency "railties", ">= 5.0", "< 7.2"
2020
s.add_dependency "sprockets", ">= 3.0", '< 5'
2121
s.add_dependency "sprockets-rails"
2222
s.add_dependency "tilt"

gemfiles/rails_7.1.gemfile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
source "https://rubygems.org"
2+
3+
gem "rails", "~> 7.1.1"
4+
gem "slim-rails"
5+
gem "haml"
6+
gem "kramdown"
7+
8+
gem 'coveralls', require: false
9+
10+
gemspec :path => ".././"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module AngularRailsTemplates
2-
VERSION = '1.2.0'
2+
VERSION = '1.2.1'
33
end

test/test_helper.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
Rails.backtrace_cleaner.remove_silencers!
1616

1717
# Support MiniTest 4/5
18-
Minitest::Test = MiniTest::Unit::TestCase unless defined? Minitest::Test
18+
Minitest::Test = Minitest::Unit::TestCase unless defined? Minitest::Test
1919

20-
class IntegrationTest < MiniTest::Spec
20+
class IntegrationTest < Minitest::Spec
2121
include Capybara::DSL
2222
register_spec_type(/integration$/, self)
2323
end

0 commit comments

Comments
 (0)