Skip to content

Commit

Permalink
Merge branch 'main' into pr/113
Browse files Browse the repository at this point in the history
* main: (175 commits)
  Support `[formmethod]` overrides to `_method` (hotwired#239)
  call ActionView::RecordIdentifier.dom_id explicitly (hotwired#333)
  removed a handful of extra 'the' in method descriptions (hotwired#334)
  Fix missing `activejob` dependency (hotwired#331)
  Document the turbo_frame_tag helper with multiple arguments (hotwired#329)
  Add possibility to nest turbo frames (hotwired#296)
  Fix breaking in non-Zeitwerk environment (hotwired#304)
  Problem: inability to pass additional parameters to stream channels (hotwired#308)
  Fix CI with Rails main (hotwired#314)
  add targets to assert_{,no_}turbo_stream (hotwired#321)
  fix tests for rails 7.0 (hotwired#320)
  Test on Rails 7.0
  Use where on Windows instead of which (hotwired#299) (hotwired#300)
  Bump version for 1.0.1
  Upgrade @rails/actioncable to 7.0.1
  Bump @rails/actioncable dependency to ^7.0
  Add Turbo::Broadcastable support for #broadcast_render and #broadcast_render_to (hotwired#298)
  fix a little typo for wrong constant name (hotwired#290)
  Bump version for 1.0.0
  Make clear this is included by default in Rails 7
  ...
  • Loading branch information
dhh committed May 22, 2022
2 parents f7b9468 + 79ee68a commit 5ef1337
Show file tree
Hide file tree
Showing 84 changed files with 3,337 additions and 1,502 deletions.
16 changes: 14 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,10 @@ jobs:
ruby-version:
- "2.7"
- "3.0"
rails-version:
- "6.1"
- "7.0"
- "main"
continue-on-error: [ false ]

# Disabled until minitest relaxes its upper bound: https://github.com/seattlerb/minitest/pull/862
Expand All @@ -16,7 +20,10 @@ jobs:
# - ruby-version: head
# continue-on-error: true

name: ${{ format('Tests (Ruby {0})', matrix.ruby-version) }}
env:
RAILS_VERSION: "${{ matrix.rails-version }}"

name: ${{ format('Tests (Ruby {0}, Rails {1})', matrix.ruby-version, matrix.rails-version) }}
runs-on: ubuntu-latest
continue-on-error: ${{ matrix.continue-on-error }}

Expand All @@ -30,4 +37,9 @@ jobs:
bundler-cache: true

- name: Run tests
run: bundle exec rake
run: |
bin/test test/**/*_test.rb
- name: Fail when generated changes are not checked-in
run: |
git update-index --refresh
git diff-index --quiet HEAD --
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
*.gem
/node_modules
Gemfile.lock
16 changes: 16 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,29 @@ source 'https://rubygems.org'

gemspec

rails_version = ENV.fetch("RAILS_VERSION", "6.1")

if rails_version == "main"
rails_constraint = { github: "rails/rails" }
else
rails_constraint = "~> #{rails_version}.0"
end

gem "rails", rails_constraint
gem "sprockets-rails"

gem 'rake'
gem 'byebug'
gem 'puma'

group :development, :test do
gem 'importmap-rails'
end

group :test do
gem 'capybara'
gem 'rexml'
gem 'selenium-webdriver'
gem 'webdrivers'
gem 'sqlite3'
end
180 changes: 0 additions & 180 deletions Gemfile.lock

This file was deleted.

Loading

0 comments on commit 5ef1337

Please sign in to comment.