diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4b023a5..a68f555 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,12 +19,13 @@ jobs: gemfile: - rails6.1 - rails7.0 + - rails7.1 include: - {ruby: '2.7', gemfile: rails5.1} - {ruby: '2.7', gemfile: rails5.2} - {ruby: '2.7', gemfile: rails6.0} steps: - - uses: zendesk/checkout@v3 + - uses: zendesk/checkout@v4 - uses: zendesk/setup-ruby@v1 with: ruby-version: ${{ matrix.ruby }} diff --git a/curly-templates.gemspec b/curly-templates.gemspec index 6a53c5b..5255c58 100644 --- a/curly-templates.gemspec +++ b/curly-templates.gemspec @@ -20,10 +20,10 @@ Gem::Specification.new do |s| s.rdoc_options = ["--charset=UTF-8"] - s.add_dependency("actionpack", [">= 5.1", "< 7.1"]) + s.add_dependency("actionpack", [">= 5.1", "< 7.2"]) s.add_dependency("sorted_set") - s.add_development_dependency("railties", [">= 5.1", "< 7.1"]) + s.add_development_dependency("railties", [">= 5.1", "< 7.2"]) s.add_development_dependency("rake") s.add_development_dependency("rspec", ">= 3") diff --git a/gemfiles/rails7.1.gemfile b/gemfiles/rails7.1.gemfile new file mode 100644 index 0000000..3687cfc --- /dev/null +++ b/gemfiles/rails7.1.gemfile @@ -0,0 +1,4 @@ +eval_gemfile 'common.rb' + +gem 'rails', '~> 7.1.0' +gem 'genspec', github: 'zendesk/genspec', branch: 'rails-7' diff --git a/gemfiles/rails7.1.gemfile.lock b/gemfiles/rails7.1.gemfile.lock new file mode 100644 index 0000000..780bda8 --- /dev/null +++ b/gemfiles/rails7.1.gemfile.lock @@ -0,0 +1,248 @@ +GIT + remote: https://github.com/zendesk/genspec.git + revision: 76116991caf40ef940076f702f70a141ced84ce2 + branch: rails-7 + specs: + genspec (0.3.2) + rspec (>= 2, < 4) + thor + +PATH + remote: .. + specs: + curly-templates (3.2.0) + actionpack (>= 5.1, < 7.2) + sorted_set + +GEM + remote: https://rubygems.org/ + specs: + actioncable (7.1.2) + actionpack (= 7.1.2) + activesupport (= 7.1.2) + nio4r (~> 2.0) + websocket-driver (>= 0.6.1) + zeitwerk (~> 2.6) + actionmailbox (7.1.2) + actionpack (= 7.1.2) + activejob (= 7.1.2) + activerecord (= 7.1.2) + activestorage (= 7.1.2) + activesupport (= 7.1.2) + mail (>= 2.7.1) + net-imap + net-pop + net-smtp + actionmailer (7.1.2) + actionpack (= 7.1.2) + actionview (= 7.1.2) + activejob (= 7.1.2) + activesupport (= 7.1.2) + mail (~> 2.5, >= 2.5.4) + net-imap + net-pop + net-smtp + rails-dom-testing (~> 2.2) + actionpack (7.1.2) + actionview (= 7.1.2) + activesupport (= 7.1.2) + nokogiri (>= 1.8.5) + racc + rack (>= 2.2.4) + rack-session (>= 1.0.1) + rack-test (>= 0.6.3) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + actiontext (7.1.2) + actionpack (= 7.1.2) + activerecord (= 7.1.2) + activestorage (= 7.1.2) + activesupport (= 7.1.2) + globalid (>= 0.6.0) + nokogiri (>= 1.8.5) + actionview (7.1.2) + activesupport (= 7.1.2) + builder (~> 3.1) + erubi (~> 1.11) + rails-dom-testing (~> 2.2) + rails-html-sanitizer (~> 1.6) + activejob (7.1.2) + activesupport (= 7.1.2) + globalid (>= 0.3.6) + activemodel (7.1.2) + activesupport (= 7.1.2) + activerecord (7.1.2) + activemodel (= 7.1.2) + activesupport (= 7.1.2) + timeout (>= 0.4.0) + activestorage (7.1.2) + actionpack (= 7.1.2) + activejob (= 7.1.2) + activerecord (= 7.1.2) + activesupport (= 7.1.2) + marcel (~> 1.0) + activesupport (7.1.2) + base64 + bigdecimal + concurrent-ruby (~> 1.0, >= 1.0.2) + connection_pool (>= 2.2.5) + drb + i18n (>= 1.6, < 2) + minitest (>= 5.1) + mutex_m + tzinfo (~> 2.0) + base64 (0.2.0) + benchmark-ips (2.12.0) + bigdecimal (3.1.4) + builder (3.2.4) + concurrent-ruby (1.2.2) + connection_pool (2.4.1) + crass (1.0.6) + date (3.3.4) + diff-lcs (1.5.0) + drb (2.2.0) + ruby2_keywords + erubi (1.12.0) + github-markup (4.0.2) + globalid (1.2.1) + activesupport (>= 6.1) + i18n (1.14.1) + concurrent-ruby (~> 1.0) + io-console (0.6.0) + irb (1.9.0) + rdoc + reline (>= 0.3.8) + loofah (2.21.4) + crass (~> 1.0.2) + nokogiri (>= 1.12.0) + mail (2.8.1) + mini_mime (>= 0.1.1) + net-imap + net-pop + net-smtp + marcel (1.0.2) + mini_mime (1.1.5) + minitest (5.20.0) + mutex_m (0.2.0) + net-imap (0.4.5) + date + net-protocol + net-pop (0.1.2) + net-protocol + net-protocol (0.2.2) + timeout + net-smtp (0.4.0) + net-protocol + nio4r (2.5.9) + nokogiri (1.15.4-arm64-darwin) + racc (~> 1.4) + psych (5.1.1.1) + stringio + racc (1.7.3) + rack (3.0.8) + rack-session (2.0.0) + rack (>= 3.0.0) + rack-test (2.1.0) + rack (>= 1.3) + rackup (2.1.0) + rack (>= 3) + webrick (~> 1.8) + rails (7.1.2) + actioncable (= 7.1.2) + actionmailbox (= 7.1.2) + actionmailer (= 7.1.2) + actionpack (= 7.1.2) + actiontext (= 7.1.2) + actionview (= 7.1.2) + activejob (= 7.1.2) + activemodel (= 7.1.2) + activerecord (= 7.1.2) + activestorage (= 7.1.2) + activesupport (= 7.1.2) + bundler (>= 1.15.0) + railties (= 7.1.2) + rails-dom-testing (2.2.0) + activesupport (>= 5.0.0) + minitest + nokogiri (>= 1.6) + rails-html-sanitizer (1.6.0) + loofah (~> 2.21) + nokogiri (~> 1.14) + railties (7.1.2) + actionpack (= 7.1.2) + activesupport (= 7.1.2) + irb + rackup (>= 1.0.0) + rake (>= 12.2) + thor (~> 1.0, >= 1.2.2) + zeitwerk (~> 2.6) + rake (13.1.0) + rbtree (0.4.6) + rdoc (6.6.0) + psych (>= 4.0.0) + redcarpet (3.6.0) + reline (0.4.0) + io-console (~> 0.5) + rspec (3.12.0) + rspec-core (~> 3.12.0) + rspec-expectations (~> 3.12.0) + rspec-mocks (~> 3.12.0) + rspec-core (3.12.2) + rspec-support (~> 3.12.0) + rspec-expectations (3.12.3) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-mocks (3.12.6) + diff-lcs (>= 1.2.0, < 2.0) + rspec-support (~> 3.12.0) + rspec-rails (6.0.3) + actionpack (>= 6.1) + activesupport (>= 6.1) + railties (>= 6.1) + rspec-core (~> 3.12) + rspec-expectations (~> 3.12) + rspec-mocks (~> 3.12) + rspec-support (~> 3.12) + rspec-support (3.12.1) + ruby2_keywords (0.0.5) + set (1.0.3) + sorted_set (1.0.3) + rbtree + set (~> 1.0) + stackprof (0.2.25) + stringio (3.0.9) + thor (1.3.0) + timeout (0.4.1) + tomparse (0.4.2) + tzinfo (2.0.6) + concurrent-ruby (~> 1.0) + webrick (1.8.1) + websocket-driver (0.7.6) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.5) + yard (0.9.34) + yard-tomdoc (0.7.1) + tomparse (>= 0.4.0) + yard + zeitwerk (2.6.12) + +PLATFORMS + arm64-darwin-22 + +DEPENDENCIES + benchmark-ips + curly-templates! + genspec! + github-markup + rails (~> 7.1.0) + railties (>= 5.1, < 7.2) + rake + redcarpet + rspec (>= 3) + rspec-rails + stackprof + yard + yard-tomdoc + +BUNDLED WITH + 2.4.17 diff --git a/spec/integration/context_blocks_spec.rb b/spec/integration/context_blocks_spec.rb index 8f850f4..1e401eb 100644 --- a/spec/integration/context_blocks_spec.rb +++ b/spec/integration/context_blocks_spec.rb @@ -5,7 +5,7 @@ get '/new' case "#{ActionPack::VERSION::MAJOR}.#{ActionPack::VERSION::MINOR}" - when '6.1', '7.0' + when '6.1', '7.0', '7.1' expect(response.body).to have_structure <<-HTML.strip_heredoc