Skip to content

Commit b42317e

Browse files
authored
Merge pull request #39 from blocknotes/test-replace-selenium
test: replace Selenium with Cuprite
2 parents 9cfe967 + 945b735 commit b42317e

File tree

6 files changed

+28
-9
lines changed

6 files changed

+28
-9
lines changed

.github/workflows/specs_rails61.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: Specs Rails 6.1 with Administrate 0.16
2+
name: Specs Rails 6.1 with Administrate 0.18
33

44
on:
55
pull_request:
@@ -17,7 +17,7 @@ jobs:
1717

1818
env:
1919
RAILS_VERSION: 6.0
20-
ADMINISTRATE_VERSION: 0.16.0
20+
ADMINISTRATE_VERSION: 0.18.0
2121

2222
steps:
2323
- name: Checkout repository

Gemfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ gem 'sprockets-rails'
4444

4545
# Testing
4646
gem 'capybara'
47+
gem 'cuprite'
4748
gem 'rails-controller-testing'
4849
gem 'rspec_junit_formatter'
4950
gem 'rspec-rails'
50-
gem 'selenium-webdriver'
5151
gem 'simplecov', require: false
5252
gem 'super_diff'
5353

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
[![gem version](https://badge.fury.io/rb/administrate_ransack.svg)](https://badge.fury.io/rb/administrate_ransack)
33
[![gem downloads](https://badgen.net/rubygems/dt/administrate_ransack)](https://rubygems.org/gems/administrate_ransack)
44
[![linters](https://github.com/blocknotes/administrate_ransack/actions/workflows/linters.yml/badge.svg)](https://github.com/blocknotes/administrate_ransack/actions/workflows/linters.yml)
5-
[![specs](https://github.com/blocknotes/administrate_ransack/actions/workflows/specs.yml/badge.svg)](https://github.com/blocknotes/administrate_ransack/actions/workflows/specs.yml)
6-
[![specs Rails7](https://github.com/blocknotes/administrate_ransack/actions/workflows/specs2.yml/badge.svg)](https://github.com/blocknotes/administrate_ransack/actions/workflows/specs2.yml)
5+
[![Specs Rails 8.0](https://github.com/blocknotes/administrate_ransack/actions/workflows/specs_rails80.yml/badge.svg)](https://github.com/blocknotes/administrate_ransack/actions/workflows/specs_rails80.yml)
76

87
A plugin for [Administrate](https://github.com/thoughtbot/administrate) to use [Ransack](https://github.com/activerecord-hackery/ransack) for filtering resources.
98

administrate_ransack.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ Gem::Specification.new do |spec|
2020

2121
spec.files = Dir['{app,config,lib}/**/*', 'MIT-LICENSE', 'Rakefile', 'README.md']
2222

23-
spec.add_runtime_dependency 'administrate'
24-
spec.add_runtime_dependency 'ransack', '>= 2.3', '< 5'
23+
spec.add_dependency 'administrate', '>= 0.18'
24+
spec.add_dependency 'ransack', '>= 2.3', '< 5'
2525
end

spec/rails_helper.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
require 'rspec/rails'
1515
require 'capybara/rails'
16-
require 'selenium-webdriver'
1716

1817
Dir[File.expand_path('support/**/*.rb', __dir__)].each { |f| require f }
1918

spec/support/capybara.rb

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,28 @@
11
# frozen_string_literal: true
22

3+
require 'capybara/cuprite'
4+
5+
Capybara.register_driver(:capybara_cuprite) do |app|
6+
browser_options = {}.tap do |opts|
7+
opts['no-sandbox'] = nil if ENV['DEVEL']
8+
end
9+
10+
Capybara::Cuprite::Driver.new(
11+
app,
12+
window_size: [1600, 1024],
13+
browser_options: browser_options,
14+
process_timeout: 30,
15+
timeout: 30,
16+
inspector: true,
17+
headless: !ENV['CUPRITE_HEADLESS'].in?(%w[n 0 no false])
18+
)
19+
end
20+
21+
# Capybara.server = :puma
22+
Capybara.default_driver = Capybara.javascript_driver = :capybara_cuprite
23+
324
RSpec.configure do |config|
425
config.prepend_before(:each, type: :system) do
5-
driven_by :selenium, using: :headless_chrome
26+
driven_by Capybara.javascript_driver
627
end
728
end

0 commit comments

Comments
 (0)