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 capybara-webkit #279

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
3 changes: 1 addition & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,7 @@ group :test do
gem 'simplecov'
gem 'database_cleaner'
gem 'capybara'
gem 'capybara-webkit' # Needs qt5-default qt5-qmake libqt5webkit5-dev
gem 'webdrivers', '~> 5.0'
gem 'selenium-webdriver'
gem 'launchy'
gem 'factory_bot_rails'
gem 'rails-controller-testing'
Expand Down
17 changes: 4 additions & 13 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,6 @@ GEM
rack-test (>= 0.6.3)
regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2)
capybara-webkit (1.15.1)
capybara (>= 2.3, < 4.0)
json
chronic (0.10.2)
cocoon (1.2.15)
coderay (1.1.3)
Expand Down Expand Up @@ -171,7 +168,6 @@ GEM
railties (>= 3.2)
jquery-ui-rails (6.0.1)
railties (>= 3.2.16)
json (2.6.3)
kramdown (2.4.0)
rexml
kramdown-parser-gfm (1.1.0)
Expand Down Expand Up @@ -292,7 +288,7 @@ GEM
sprockets (> 3.0)
sprockets-rails
tilt
selenium-webdriver (4.10.0)
selenium-webdriver (4.14.0)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
Expand Down Expand Up @@ -322,17 +318,13 @@ GEM
uri (0.12.2)
warden (1.2.9)
rack (>= 2.0.9)
webdrivers (5.2.0)
nokogiri (~> 1.6)
rubyzip (>= 1.3.0)
selenium-webdriver (~> 4.0)
webpacker (5.4.4)
activesupport (>= 5.2)
rack-proxy (>= 0.6.1)
railties (>= 5.2)
semantic_range (>= 2.3.0)
webrick (1.8.1)
websocket (1.2.9)
websocket (1.2.10)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
Expand Down Expand Up @@ -364,7 +356,6 @@ DEPENDENCIES
bootstrap3-datetimepicker-rails
bundler-audit
capybara
capybara-webkit
cocoon
coffee-rails
coffee-rails-source-maps
Expand Down Expand Up @@ -400,16 +391,16 @@ DEPENDENCIES
rouge
rubyzip
sassc-rails
selenium-webdriver
simplecov
single_test
sprockets (~> 3.7)
uglifier
webdrivers (~> 5.0)
webpacker
webrick
whenever
write_xlsx
yaml_db

BUNDLED WITH
2.3.14
2.4.21
8 changes: 1 addition & 7 deletions config/environments/test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,7 @@ def find_executable(names)


Rails.application.configure do
driver_path = find_executable ['chromium.chromedriver', 'chromedriver']
if driver_path&.start_with? "/snap"
Selenium::WebDriver::Chrome::Service.driver_path = driver_path
else
Selenium::WebDriver::Chrome.path = find_executable ['chrome', 'chromium-browser', 'chromium']
end


# Settings specified here will take precedence over those in config/application.rb.

# Turn false under Spring and add config.action_view.cache_template_loading = true.
Expand Down
1 change: 0 additions & 1 deletion test/integration/calc_scores_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
class CalcScoresTest < ActionDispatch::IntegrationTest
setup do
DatabaseCleaner.clean
Capybara.current_driver = :webkit
end

def test_create_teams_submit_and_grade_many
Expand Down
1 change: 0 additions & 1 deletion test/integration/submissions_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ class SubmissionsTest < ActionDispatch::IntegrationTest
include Devise::Test::IntegrationHelpers
setup do
DatabaseCleaner.clean
Capybara.current_driver = :webkit
make_standard_course
end

Expand Down
1 change: 0 additions & 1 deletion test/integration/teams_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
class TeamsTest < ActionDispatch::IntegrationTest
setup do
DatabaseCleaner.clean
Capybara.current_driver = :webkit

make_standard_course

Expand Down
1 change: 0 additions & 1 deletion test/integration/teamsets_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ class TeamsetsTest < ActionDispatch::IntegrationTest
include Devise::Test::IntegrationHelpers
setup do
DatabaseCleaner.clean
Capybara.current_driver = :webkit
@team = create(:team)
@fred = create(:user)
r = create(:registration, user: @fred, course: @team.course, new_sections: [@team.course.sections.first],
Expand Down
4 changes: 0 additions & 4 deletions test/test_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,3 @@ def login_as(user)
assert has_content?("Logged in as #{user.name}")
end
end

Capybara::Webkit.configure do |config|
config.allow_url("test.host")
end
2,497 changes: 1,336 additions & 1,161 deletions yarn.lock
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This got checked in without a package.json update as well. Did this get updated on your end along with the lock file here?

Large diffs are not rendered by default.