Skip to content
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
2 changes: 2 additions & 0 deletions .github/workflows/linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ on:
branches:
- master
pull_request:
branches:
- master

jobs:
reviewdog:
Expand Down
16 changes: 11 additions & 5 deletions .github/workflows/specs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ name: Specs

on:
push:
branches: [develop, master]
branches:
- master
pull_request:
branches: [develop, master]
branches:
- master

jobs:
test:
Expand All @@ -14,9 +16,13 @@ jobs:
strategy:
matrix:
ruby: ['2.6', '2.7', '3.0']
gemfile: ['rails60_administrate016', 'rails60_administrate', 'rails61_administrate016', 'rails61_administrate']

env:
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile

steps:
- name: Checkout
- name: Checkout repository
uses: actions/checkout@v2

- name: Set up Ruby
Expand All @@ -26,9 +32,9 @@ jobs:
bundler-cache: true

- name: Run tests
run: bin/rspec --profile
run: bundle exec rspec --profile

- name: Archive screenshots for failed tests
- name: On failure, archive screenshots as artifacts
uses: actions/upload-artifact@v2
if: failure()
with:
Expand Down
42 changes: 42 additions & 0 deletions .github/workflows/specs2.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
---
name: Specs (2)

on:
push:
branches:
- master
pull_request:
branches:
- master

jobs:
test:
runs-on: ubuntu-latest

strategy:
matrix:
ruby: ['2.7', '3.0']
gemfile: ['rails70_administrate016', 'rails70_administrate']

env:
BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}.gemfile

steps:
- name: Checkout repository
uses: actions/checkout@v2

- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ matrix.ruby }}
bundler-cache: true

- name: Run tests
run: bundle exec rspec --profile

- name: On failure, archive screenshots as artifacts
uses: actions/upload-artifact@v2
if: failure()
with:
name: test-failed-screenshots
path: spec/dummy/tmp/screenshots
1 change: 1 addition & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ AllCops:
TargetRubyVersion: 2.7
Exclude:
- bin/*
- gemfiles/*
- spec/dummy/**/*
- vendor/**/*
NewCops: enable
Expand Down
30 changes: 30 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# frozen_string_literal: true

appraise 'rails60-administrate016' do
gem 'administrate', '~> 0.16.0'
gem 'rails', '~> 6.0.0'
gem 'selenium-webdriver', require: false # Fix
end

appraise 'rails60-administrate' do # latest administrate
gem 'rails', '~> 6.0.0'
gem 'selenium-webdriver', require: false # Fix
end

appraise 'rails61-administrate016' do
gem 'administrate' # , '~> 0.16.0'
gem 'rails', '~> 6.1.0'
end

appraise 'rails61-administrate' do # latest administrate
gem 'rails', '~> 6.1.0'
end

appraise 'rails70-administrate016' do
gem 'administrate', '~> 0.16.0'
gem 'rails', '~> 7.0.0'
end

appraise 'rails70-administrate' do # latest administrate
gem 'rails', '~> 7.0.0'
end
15 changes: 6 additions & 9 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,15 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
gemspec

group :development, :test do
gem 'activestorage', '~> 6.0'
gem 'puma', '~> 4.3'
gem 'sassc', '~> 2.4'
gem 'sprockets-rails', '~> 3.2'
gem 'sqlite3', '~> 1.4'
gem 'puma'
gem 'sqlite3'

# Testing
gem 'capybara', '~> 3.33'
gem 'cuprite', '~> 0.13'
gem 'capybara'
gem 'cuprite'
gem 'rails-controller-testing'
gem 'rspec_junit_formatter', '~> 0.4'
gem 'rspec-rails', '~> 4.0'
gem 'rspec_junit_formatter'
gem 'rspec-rails'

# Linters
gem 'fasterer'
Expand Down
2 changes: 2 additions & 0 deletions administrate_ransack.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,6 @@ Gem::Specification.new do |spec|

spec.add_runtime_dependency 'administrate', '~> 0.14'
spec.add_runtime_dependency 'ransack', '~> 2.3'

spec.add_development_dependency 'appraisal', '~> 2.4'
end
29 changes: 29 additions & 0 deletions bin/appraisal
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
#!/usr/bin/env ruby
# frozen_string_literal: true

#
# This file was generated by Bundler.
#
# The application 'appraisal' is installed as part of a gem, and
# this file is here to facilitate running it.
#

require "pathname"
ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
Pathname.new(__FILE__).realpath)

bundle_binstub = File.expand_path("../bundle", __FILE__)

if File.file?(bundle_binstub)
if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
load(bundle_binstub)
else
abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
end
end

require "rubygems"
require "bundler/setup"

load Gem.bin_path("appraisal", "appraisal")
11 changes: 11 additions & 0 deletions extra/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Development

## Testing

```sh
# Running specs per Rails/Administrate versions:
bin/appraisal rails60-administrate016 rspec
# Using latest Administrate version:
bin/appraisal rails70-administrate rspec
# See gemfiles for more configurations
```
25 changes: 25 additions & 0 deletions gemfiles/rails60_administrate.gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "rails", "~> 6.0.0"
gem "selenium-webdriver", require: false

group :development, :test do
gem "puma"
gem "sqlite3"
gem "capybara"
gem "cuprite"
gem "rails-controller-testing"
gem "rspec_junit_formatter"
gem "rspec-rails"
gem "fasterer"
gem "rubocop"
gem "rubocop-packaging"
gem "rubocop-performance"
gem "rubocop-rails"
gem "rubocop-rspec"
gem "pry-rails"
end

gemspec path: "../"
Loading