Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove actionpack-action_caching from test setup #43

Merged
merged 2 commits into from
Nov 21, 2024
Merged
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
17 changes: 16 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,25 @@ jobs:
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby-version }}
- run: bundle install
bundler-cache: true
- name: Tests
run: bundle exec rake test

tests_successful:
name: Tests passing?
needs: tests
if: always()
runs-on: ubuntu-latest
steps:
- run: |
if ${{ needs.tests.result == 'success' }}
then
echo "All tests pass"
else
echo "Some tests failed"
false
fi
linter:
runs-on: ubuntu-latest
name: Linting of Ruby files
Expand Down
9 changes: 2 additions & 7 deletions charcoal.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,6 @@ Gem::Specification.new("charcoal", Charcoal::VERSION) do |s|

s.licenses = ["MIT"]

s.add_runtime_dependency "activesupport", ">= 6.1"
s.add_runtime_dependency "actionpack", ">= 6.1"

s.add_development_dependency "rake"
s.add_development_dependency "yard", ">= 0.9.11"

s.add_development_dependency "shoulda", "~> 3.0"
s.add_dependency "activesupport", ">= 6.1"
s.add_dependency "actionpack", ">= 6.1"
end
3 changes: 3 additions & 0 deletions gemfiles/common.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,7 @@
gemspec path: "../"

gem "byebug", platforms: :mri
gem "rake"
gem "shoulda", "~> 3.0"
gem "standard"
gem "yard", ">= 0.9.11"
1 change: 0 additions & 1 deletion gemfiles/rails6.1.gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
eval_gemfile "common.rb"

gem "rails", "~> 6.1.0"
gem "actionpack-action_caching"
1 change: 0 additions & 1 deletion gemfiles/rails7.0.gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
eval_gemfile "common.rb"

gem "rails", "~> 7.0.0"
gem "actionpack-action_caching"
1 change: 0 additions & 1 deletion gemfiles/rails7.1.gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
eval_gemfile "common.rb"

gem "rails", "~> 7.1.0"
gem "actionpack-action_caching"
1 change: 0 additions & 1 deletion gemfiles/rails7.2.gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
eval_gemfile "common.rb"

gem "rails", "~> 7.2.0"
gem "actionpack-action_caching"
1 change: 0 additions & 1 deletion gemfiles/rails8.0.gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
eval_gemfile "common.rb"

gem "rails", "~> 8.0.0"
gem "actionpack-action_caching"
1 change: 0 additions & 1 deletion gemfiles/rails_main.gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
eval_gemfile "common.rb"

gem "rails", github: "rails/rails", branch: "main"
gem "actionpack-action_caching"
1 change: 0 additions & 1 deletion test/helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,4 @@ def setup
end
end

require "action_controller/action_caching"
require "charcoal"
1 change: 0 additions & 1 deletion test/jsonp_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
class JSONPControllerTester < ActionController::Base
include Charcoal::JSONP

caches_action :test
allow_jsonp :test

def test
Expand Down