Skip to content

Commit

Permalink
Merge pull request #1230 from dradis/specs/firefox-driver
Browse files Browse the repository at this point in the history 
Use firefox as the capybara js driver
  • Loading branch information
@aapomm
aapomm authored Feb 26, 2024
2 parents e1e0493 + b5e1769 commit 2cdcfc1
Show file tree
Hide file tree
Showing 10 changed files with 121 additions and 103 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
RAILS_ENV: test
steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Create database.yml
run: cp config/database.yml.template config/database.yml
- name: Install Ruby and gems
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
- [entity]:
- [future tense verb] [feature]
- Upgraded gems:
- [gem]
- nokogiri, rails
- Bugs fixes:
- Tylium: Fix redirection when updating an issue or content block
- Bug tracker items:
Expand Down
7 changes: 3 additions & 4 deletions Gemfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ gem 'bootsnap', '>= 1.12.0', require: false
# ---------------------------------------------------- Dradis Community Edition
gem 'bootstrap', '~> 5.2.3'
gem 'jquery-rails'
gem 'jquery-ui-rails'
gem 'jquery-fileupload-rails', '~> 0.3.4'
gem 'jquery-hotkeys-rails'

Expand Down Expand Up @@ -87,7 +86,7 @@ gem 'bcrypt', '3.1.12'
gem 'json', '2.3.0'

# XML manipulation
gem 'nokogiri', '>= 1.14.3'
gem 'nokogiri', '>= 1.16.2'

# MySQL backend
# gem 'mysql2', '~> 0.5.1'
Expand Down Expand Up @@ -191,7 +190,7 @@ group :test do
gem 'factory_bot_rails'
gem 'capybara', '~> 3.39'
gem 'guard-rspec', require: false
gem 'selenium-webdriver', '~> 4.11'
gem 'selenium-webdriver', '~> 4.17'
gem 'shoulda-matchers', '~> 3.1'
gem 'timecop'

Expand All @@ -214,7 +213,7 @@ end
#

# Base framework classes required by other plugins
gem 'dradis-plugins', '~> 4.11.0'
gem 'dradis-plugins', github: 'dradis/dradis-plugins', branch: 'fix/template-caching'

gem 'dradis-api', path: 'engines/dradis-api'

Expand Down
165 changes: 85 additions & 80 deletions Gemfile.lock
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
GIT
remote: https://github.com/dradis/dradis-plugins.git
revision: e69d1f42c85f647662307019b8b492152a5c3c29
branch: fix/template-caching
specs:
dradis-plugins (4.11.0)

PATH
remote: engines/dradis-api
specs:
Expand All @@ -8,67 +15,67 @@ GEM
remote: https://rubygems.org/
specs:
RedCloth (4.3.2)
actioncable (7.0.8)
actionpack (= 7.0.8)
activesupport (= 7.0.8)
actioncable (7.0.8.1)
actionpack (= 7.0.8.1)
activesupport (= 7.0.8.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (7.0.8)
actionpack (= 7.0.8)
activejob (= 7.0.8)
activerecord (= 7.0.8)
activestorage (= 7.0.8)
activesupport (= 7.0.8)
actionmailbox (7.0.8.1)
actionpack (= 7.0.8.1)
activejob (= 7.0.8.1)
activerecord (= 7.0.8.1)
activestorage (= 7.0.8.1)
activesupport (= 7.0.8.1)
mail (>= 2.7.1)
net-imap
net-pop
net-smtp
actionmailer (7.0.8)
actionpack (= 7.0.8)
actionview (= 7.0.8)
activejob (= 7.0.8)
activesupport (= 7.0.8)
actionmailer (7.0.8.1)
actionpack (= 7.0.8.1)
actionview (= 7.0.8.1)
activejob (= 7.0.8.1)
activesupport (= 7.0.8.1)
mail (~> 2.5, >= 2.5.4)
net-imap
net-pop
net-smtp
rails-dom-testing (~> 2.0)
actionpack (7.0.8)
actionview (= 7.0.8)
activesupport (= 7.0.8)
actionpack (7.0.8.1)
actionview (= 7.0.8.1)
activesupport (= 7.0.8.1)
rack (~> 2.0, >= 2.2.4)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (7.0.8)
actionpack (= 7.0.8)
activerecord (= 7.0.8)
activestorage (= 7.0.8)
activesupport (= 7.0.8)
actiontext (7.0.8.1)
actionpack (= 7.0.8.1)
activerecord (= 7.0.8.1)
activestorage (= 7.0.8.1)
activesupport (= 7.0.8.1)
globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
actionview (7.0.8)
activesupport (= 7.0.8)
actionview (7.0.8.1)
activesupport (= 7.0.8.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (7.0.8)
activesupport (= 7.0.8)
activejob (7.0.8.1)
activesupport (= 7.0.8.1)
globalid (>= 0.3.6)
activemodel (7.0.8)
activesupport (= 7.0.8)
activerecord (7.0.8)
activemodel (= 7.0.8)
activesupport (= 7.0.8)
activestorage (7.0.8)
actionpack (= 7.0.8)
activejob (= 7.0.8)
activerecord (= 7.0.8)
activesupport (= 7.0.8)
activemodel (7.0.8.1)
activesupport (= 7.0.8.1)
activerecord (7.0.8.1)
activemodel (= 7.0.8.1)
activesupport (= 7.0.8.1)
activestorage (7.0.8.1)
actionpack (= 7.0.8.1)
activejob (= 7.0.8.1)
activerecord (= 7.0.8.1)
activesupport (= 7.0.8.1)
marcel (~> 1.0)
mini_mime (>= 1.1.0)
activesupport (7.0.8)
activesupport (7.0.8.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
Expand All @@ -80,6 +87,7 @@ GEM
ast (2.4.2)
autoprefixer-rails (10.4.13.0)
execjs (~> 2)
base64 (0.2.0)
bcrypt (3.1.12)
bindex (0.8.1)
blankslate (3.1.3)
Expand Down Expand Up @@ -118,10 +126,10 @@ GEM
activesupport (>= 3.0.0)
railties (>= 3.0.0)
thor (>= 0.14.6)
concurrent-ruby (1.2.2)
concurrent-ruby (1.2.3)
crass (1.0.6)
database_cleaner (1.8.2)
date (3.3.3)
date (3.3.4)
diff-lcs (1.5.0)
differ (0.1.2)
dradis-acunetix (4.11.0)
Expand Down Expand Up @@ -170,7 +178,6 @@ GEM
dradis-plugins (~> 4.0)
dradis-openvas (4.11.0)
dradis-plugins (~> 4.0)
dradis-plugins (4.11.0)
dradis-projects (4.11.0)
dradis-plugins (>= 4.8.0)
rubyzip
Expand Down Expand Up @@ -239,8 +246,6 @@ GEM
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
jquery-ui-rails (6.0.1)
railties (>= 3.2.16)
json (2.3.0)
kaminari (1.2.1)
activesupport (>= 4.1.0)
Expand All @@ -267,7 +272,7 @@ GEM
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
local_time (2.1.0)
loofah (2.21.3)
loofah (2.22.0)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
lumberjack (1.2.4)
Expand All @@ -280,34 +285,34 @@ GEM
matrix (0.4.2)
method_source (0.9.2)
mini_mime (1.1.5)
mini_portile2 (2.8.4)
mini_portile2 (2.8.5)
mini_racer (0.6.2)
libv8-node (~> 16.10.0.0)
minitest (5.20.0)
minitest (5.22.2)
mono_logger (1.1.1)
msgpack (1.5.2)
multi_json (1.15.0)
mustermann (2.0.2)
ruby2_keywords (~> 0.0.1)
nenv (0.3.0)
net-imap (0.3.7)
net-imap (0.4.10)
date
net-protocol
net-pop (0.1.2)
net-protocol
net-protocol (0.2.1)
net-protocol (0.2.2)
timeout
net-smtp (0.3.3)
net-smtp (0.4.0.1)
net-protocol
nio4r (2.5.9)
nokogiri (1.15.4)
nio4r (2.7.0)
nokogiri (1.16.2)
mini_portile2 (~> 2.8.2)
racc (~> 1.4)
nokogiri (1.15.4-arm64-darwin)
nokogiri (1.16.2-arm64-darwin)
racc (~> 1.4)
nokogiri (1.15.4-x86_64-darwin)
nokogiri (1.16.2-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.15.4-x86_64-linux)
nokogiri (1.16.2-x86_64-linux)
racc (~> 1.4)
notiffany (0.1.3)
nenv (~> 0.1)
Expand All @@ -328,28 +333,28 @@ GEM
public_suffix (5.0.3)
puma (6.4.2)
nio4r (~> 2.0)
racc (1.7.1)
rack (2.2.8)
racc (1.7.3)
rack (2.2.8.1)
rack-mini-profiler (2.3.0)
rack (>= 1.2.0)
rack-protection (2.2.3)
rack
rack-test (2.1.0)
rack (>= 1.3)
rails (7.0.8)
actioncable (= 7.0.8)
actionmailbox (= 7.0.8)
actionmailer (= 7.0.8)
actionpack (= 7.0.8)
actiontext (= 7.0.8)
actionview (= 7.0.8)
activejob (= 7.0.8)
activemodel (= 7.0.8)
activerecord (= 7.0.8)
activestorage (= 7.0.8)
activesupport (= 7.0.8)
rails (7.0.8.1)
actioncable (= 7.0.8.1)
actionmailbox (= 7.0.8.1)
actionmailer (= 7.0.8.1)
actionpack (= 7.0.8.1)
actiontext (= 7.0.8.1)
actionview (= 7.0.8.1)
activejob (= 7.0.8.1)
activemodel (= 7.0.8.1)
activerecord (= 7.0.8.1)
activestorage (= 7.0.8.1)
activesupport (= 7.0.8.1)
bundler (>= 1.15.0)
railties (= 7.0.8)
railties (= 7.0.8.1)
rails-dom-testing (2.2.0)
activesupport (>= 5.0.0)
minitest
Expand All @@ -360,15 +365,15 @@ GEM
actionview (> 3.1)
activesupport (> 3.1)
railties (> 3.1)
railties (7.0.8)
actionpack (= 7.0.8)
activesupport (= 7.0.8)
railties (7.0.8.1)
actionpack (= 7.0.8.1)
activesupport (= 7.0.8.1)
method_source
rake (>= 12.2)
thor (~> 1.0)
zeitwerk (~> 2.5)
rainbow (3.1.1)
rake (13.0.6)
rake (13.1.0)
rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
Expand Down Expand Up @@ -447,7 +452,8 @@ GEM
sprockets (> 3.0)
sprockets-rails
tilt
selenium-webdriver (4.11.0)
selenium-webdriver (4.18.1)
base64 (~> 0.2)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
Expand Down Expand Up @@ -478,7 +484,7 @@ GEM
time (0.2.2)
date
timecop (0.9.5)
timeout (0.4.0)
timeout (0.4.1)
turbolinks (5.2.1)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
Expand All @@ -494,15 +500,15 @@ GEM
activemodel (>= 6.0.0)
bindex (>= 0.4.0)
railties (>= 6.0.0)
websocket (1.2.9)
websocket (1.2.10)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
whenever (1.0.0)
chronic (>= 0.6.3)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.6.11)
zeitwerk (2.6.13)

PLATFORMS
arm64-darwin
Expand Down Expand Up @@ -544,7 +550,7 @@ DEPENDENCIES
dradis-nmap (~> 4.11.0)
dradis-ntospider (~> 4.11.0)
dradis-openvas (~> 4.11.0)
dradis-plugins (~> 4.11.0)
dradis-plugins!
dradis-projects (~> 4.11.0)
dradis-qualys (~> 4.11.0)
dradis-saint (~> 4.11.0)
Expand All @@ -562,7 +568,6 @@ DEPENDENCIES
jquery-fileupload-rails (~> 0.3.4)
jquery-hotkeys-rails
jquery-rails
jquery-ui-rails
json (= 2.3.0)
kaminari (~> 1.2.1)
letter_opener
Expand All @@ -574,7 +579,7 @@ DEPENDENCIES
net-imap
net-pop
net-smtp
nokogiri (>= 1.14.3)
nokogiri (>= 1.16.2)
paper_trail (~> 12.2.0)
parslet (~> 1.6.0)
pg
Expand All @@ -593,7 +598,7 @@ DEPENDENCIES
rubyzip (>= 1.2.2)
sanitize (= 6.0.2)
sass-rails (~> 6.0)
selenium-webdriver (~> 4.11)
selenium-webdriver (~> 4.17)
shoulda-matchers (~> 3.1)
simple_form
sinatra (~> 2.2.3)
Expand Down
Loading

0 comments on commit 2cdcfc1

Please sign in to comment.