TheDude
/
openproject
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7630 from opf/fix/bump_gems

Browse Source 
Fix/bump gems

[ci skip]
pull/7682/head
Oliver Günther 5 years ago committed by GitHub
parent e7263fcedb daf9a70262
commit 72f8c8f4cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 232 additions and 305 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 53
      Gemfile
  2. 381
      Gemfile.lock
  3. 9
      codecov.yml
  4. 5
      features/support/env.rb
  5. 10
      lib/open_project/text_formatting/filters/sanitization_filter.rb
  6. 9
      lib/open_project/text_formatting/formats/base_formatter.rb
  7. 8
      lib/open_project/text_formatting/formats/markdown/formatter.rb
  8. 8
      lib/open_project/text_formatting/formats/plain/formatter.rb
  9. 2
      spec/features/projects/destroy_spec.rb
  10. 10
      spec/features/projects/projects_index_spec.rb
  11. 6
      spec/features/repositories/create_repository_spec.rb
  12. 2
      spec/features/support/components/danger_zone.rb
  13. 16
      spec/features/users/my_spec.rb
  14. 7
      spec/features/work_packages/details/milestones_spec.rb
  15. 7
      spec/rails_helper.rb
  16. 4
      spec/support/components/password_confirmation_dialog.rb

53
Gemfile
Unescape View File

@ -32,9 +32,9 @@ ruby '~> 2.6.1'
gem 'actionpack-xml_parser', '~> 2.0.0'
gem 'activemodel-serializers-xml', '~> 1.0.1'
gem 'activerecord-import', '~> 0.28.1'
gem 'activerecord-import', '~> 1.0.2'
gem 'activerecord-session_store', '~> 1.1.0'
gem 'rails', git: 'https://github.com/rails/rails', ref: '6-0-stable'
gem 'rails', '~> 6.0.0'
gem 'responders', '~> 3.0'
gem 'rdoc', '>= 2.4.2'
@ -54,12 +54,12 @@ gem 'will_paginate', '~> 3.1.7'
gem 'friendly_id', git: 'https://github.com/norman/friendly_id', ref: '67422c04e1bfed4207b2a04826bc67ec0e231ce7'
gem 'acts_as_list', '~> 0.9.9'
gem 'acts_as_tree', '~> 2.8.0'
gem 'acts_as_tree', '~> 2.9.0'
gem 'awesome_nested_set', '~> 3.2.0'
gem 'rubytree', git: 'https://github.com/dr0verride/RubyTree.git', ref: '06f53ee'
gem 'rubytree', '~> 1.0.0'
gem 'typed_dag', '~> 2.0.2'
gem 'addressable', '~> 2.6.0'
gem 'addressable', '~> 2.7.0'
# Provide timezone info for TZInfo used by AR
gem 'tzinfo-data', '~> 1.2018.9'
@ -75,7 +75,7 @@ gem 'commonmarker', '~> 0.20.1'
# HTML pipeline for transformations on text formatter output
# such as sanitization or additional features
gem 'html-pipeline', '~> 2.8.0'
gem 'html-pipeline', '~> 2.12.0'
# Tasklist parsing and renderer
gem 'deckar01-task_list', '2.2.0'
# Requires escape-utils for faster escaping
@ -83,7 +83,7 @@ gem 'escape_utils', '~> 1.0'
# Syntax highlighting used in html-pipeline with rouge
gem 'rouge', '~> 3.1.1'
# HTML sanitization used for html-pipeline
gem 'sanitize', '~> 5.0.0'
gem 'sanitize', '~> 5.1.0'
# HTML autolinking for mails and urls (replaces autolink)
gem 'rinku', '~> 2.0.4'
# Version parsing with semver
@ -105,7 +105,7 @@ gem 'posix-spawn', '~> 0.3.13', require: false
gem 'bcrypt', '~> 3.1.6'
gem 'multi_json', '~> 1.13.1'
gem 'oj', '~> 3.7.0'
gem 'oj', '~> 3.9.1'
gem 'daemons'
gem 'delayed_job_active_record', '~> 4.1.4'
@ -116,13 +116,13 @@ gem 'rack-protection', '~> 2.0.0'
# It allows whitelisting, blacklisting, throttling, and tracking based
# on arbitrary properties of the request.
# https://github.com/kickstarter/rack-attack
gem 'rack-attack', '~> 5.4.2'
gem 'rack-attack', '~> 6.1.0'
# CSP headers
gem 'secure_headers', '~> 6.0.0'
gem 'secure_headers', '~> 6.1.1'
# Browser detection for incompatibility checks
gem 'browser', '~> 2.5.3'
gem 'browser', '~> 2.6.1'
# Providing health checks
gem 'okcomputer', '~> 1.17.3'
@ -134,7 +134,7 @@ gem 'lograge', '~> 0.10.0'
# catch exceptions and send them to any airbrake compatible backend
# don't require by default, instead load on-demand when actually configured
gem 'airbrake', '~> 8.0.1', require: false
gem 'airbrake', '~> 9.4.3', require: false
gem 'prawn', '~> 2.2'
gem 'prawn-table', '~> 0.2.2'
@ -147,18 +147,14 @@ gem 'meta-tags', '~> 2.11.0'
group :production do
# we use dalli as standard memcache client
# requires memcached 1.4+
# see https://github.clientom/mperham/dalli
gem 'dalli',
git: 'https://github.com/petergoldstein/dalli',
ref: '0ff39199b5e91c6dbdaabc7c085b81938d0f08d2'
gem 'dalli', '~> 2.7.10'
# Unicorn worker killer to restart unicorn child workers
gem 'unicorn-worker-killer', require: false
end
gem 'autoprefixer-rails', '~> 9.4.5'
# use until proper release no longer requiring sass exists
gem 'bourbon', git: 'https://github.com/sikachu/bourbon', ref: 'a12ca168e74d3468c80500b21b525a4e12a19ef9'
gem 'bourbon', '~> 6.0.0'
gem 'i18n-js', '~> 3.2.0'
gem 'sassc-rails', '~> 2.1.0'
gem 'sprockets', '~> 3.7.0'
@ -167,16 +163,16 @@ gem 'sprockets', '~> 3.7.0'
# also, better than thin since we can control worker concurrency.
gem 'unicorn'
gem 'puma', '~> 4.0.0' # used for development and optionally for production
gem 'puma', '~> 4.1.0' # used for development and optionally for production
gem 'nokogiri', '~> 1.10.4'
gem 'carrierwave', '~> 1.3.1'
gem 'fog-aws'
gem 'aws-sdk-core', '~> 3.46.0'
gem 'aws-sdk-core', '~> 3.66.0'
# File upload via fog + screenshots on travis
gem 'aws-sdk-s3', '~> 1.30.1'
gem 'aws-sdk-s3', '~> 1.48.0'
gem 'openproject-token', '~> 1.0.2'
@ -200,7 +196,7 @@ group :test do
# Test prof provides factories from code
# and other niceties
gem 'test-prof', '~> 0.7.3'
gem 'test-prof', '~> 0.10.0'
gem 'cucumber', '~> 3.1.0'
gem 'cucumber-rails', '~> 1.8.0', require: false
@ -220,7 +216,7 @@ group :test do
# brings back testing for 'assigns' and 'assert_template' extracted in rails 5
gem 'rails-controller-testing', '~> 1.0.2'
gem 'capybara', '~> 3.13.0'
gem 'capybara', '~> 3.29.0'
gem 'capybara-screenshot', '~> 1.0.17'
gem 'capybara-select2', git: 'https://github.com/goodwill/capybara-select2', ref: '585192e'
gem 'webdrivers', '~> 4.1.2', require: false
@ -228,14 +224,13 @@ group :test do
gem 'fuubar', '~> 2.3.2'
gem 'timecop', '~> 0.9.0'
gem 'webmock', '~> 3.5.0', require: false
gem 'webmock', '~> 3.7.2', require: false
gem 'equivalent-xml', '~> 0.6'
gem 'json_spec', '~> 1.1.4'
gem 'shoulda-matchers', '~> 3.1', require: nil
gem 'simplecov', '~> 0.16.0', require: false
gem 'parallel_tests', '~> 2.27.1'
gem 'parallel_tests', '~> 2.29.2'
end
group :ldap do
@ -262,7 +257,7 @@ group :development, :test do
gem 'ruby-prof', require: false
gem 'stackprof', require: false
gem 'pry-byebug', '~> 3.6.0', platforms: [:mri]
gem 'pry-byebug', '~> 3.7.0', platforms: [:mri]
gem 'pry-rails', '~> 0.3.6'
gem 'pry-rescue', '~> 1.5.0'
gem 'pry-stack_explorer', '~> 0.4.9.2'
@ -275,7 +270,7 @@ group :development, :test do
gem 'danger-brakeman'
end
gem 'bootsnap', '~> 1.3.2', require: false
gem 'bootsnap', '~> 1.4.5', require: false
# API gems
gem 'grape', '~> 1.2.3'
@ -290,7 +285,7 @@ platforms :mri, :mingw, :x64_mingw do
end
# Support application loading when no database exists yet.
gem 'activerecord-nulldb-adapter', '~> 0.3.9'
gem 'activerecord-nulldb-adapter', '~> 0.4.0'
end
group :opf_plugins do

381
Gemfile.lock
Unescape View File

@ -6,14 +6,6 @@ GIT
doorkeeper (5.0.2)
railties (>= 4.2)
GIT
remote: https://github.com/dr0verride/RubyTree.git
revision: 06f53ee78cc2a48377c1bd177d3bc83c1504701c
ref: 06f53ee
specs:
rubytree (0.9.7)
json (~> 1.8)
GIT
remote: https://github.com/finnlabs/omniauth-openid-connect.git
revision: 9e7fd0e7bd36d40451c6b3c2ea641e8d237c295d
@ -74,95 +66,6 @@ GIT
mixlib-shellout (~> 2.1.0)
rubyzip
GIT
remote: https://github.com/petergoldstein/dalli
revision: 0ff39199b5e91c6dbdaabc7c085b81938d0f08d2
ref: 0ff39199b5e91c6dbdaabc7c085b81938d0f08d2
specs:
dalli (2.7.9)
GIT
remote: https://github.com/rails/rails
revision: d46534f46b197fe76f97a2613e68dae80ba298f8
ref: 6-0-stable
specs:
actioncable (6.0.0)
actionpack (= 6.0.0)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.0.0)
actionpack (= 6.0.0)
activejob (= 6.0.0)
activerecord (= 6.0.0)
activestorage (= 6.0.0)
activesupport (= 6.0.0)
mail (>= 2.7.1)
actionmailer (6.0.0)
actionpack (= 6.0.0)
actionview (= 6.0.0)
activejob (= 6.0.0)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.0.0)
actionview (= 6.0.0)
activesupport (= 6.0.0)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (6.0.0)
actionpack (= 6.0.0)
activerecord (= 6.0.0)
activestorage (= 6.0.0)
activesupport (= 6.0.0)
nokogiri (>= 1.8.5)
actionview (6.0.0)
activesupport (= 6.0.0)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.0.0)
activesupport (= 6.0.0)
globalid (>= 0.3.6)
activemodel (6.0.0)
activesupport (= 6.0.0)
activerecord (6.0.0)
activemodel (= 6.0.0)
activesupport (= 6.0.0)
activestorage (6.0.0)
actionpack (= 6.0.0)
activejob (= 6.0.0)
activerecord (= 6.0.0)
marcel (~> 0.3.1)
activesupport (6.0.0)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
zeitwerk (~> 2.1, >= 2.1.8)
rails (6.0.0)
actioncable (= 6.0.0)
actionmailbox (= 6.0.0)
actionmailer (= 6.0.0)
actionpack (= 6.0.0)
actiontext (= 6.0.0)
actionview (= 6.0.0)
activejob (= 6.0.0)
activemodel (= 6.0.0)
activerecord (= 6.0.0)
activestorage (= 6.0.0)
activesupport (= 6.0.0)
bundler (>= 1.3.0)
railties (= 6.0.0)
sprockets-rails (>= 2.0.0)
railties (6.0.0)
actionpack (= 6.0.0)
activesupport (= 6.0.0)
method_source
rake (>= 0.8.7)
thor (>= 0.20.3, < 2.0)
GIT
remote: https://github.com/rspec/rspec-activemodel-mocks
revision: 6136a778f8b21f4f45f6b4ad5c2e2533e6d4ddc6
@ -172,14 +75,6 @@ GIT
activesupport (>= 3.0)
rspec-mocks (>= 2.99, < 4.0)
GIT
remote: https://github.com/sikachu/bourbon
revision: a12ca168e74d3468c80500b21b525a4e12a19ef9
ref: a12ca168e74d3468c80500b21b525a4e12a19ef9
specs:
bourbon (5.1.0)
thor (~> 0.19)
PATH
remote: modules/auth_plugins
specs:
@ -337,16 +232,60 @@ GEM
remote: https://rubygems.org/
specs:
Ascii85 (1.0.3)
actioncable (6.0.0)
actionpack (= 6.0.0)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailbox (6.0.0)
actionpack (= 6.0.0)
activejob (= 6.0.0)
activerecord (= 6.0.0)
activestorage (= 6.0.0)
activesupport (= 6.0.0)
mail (>= 2.7.1)
actionmailer (6.0.0)
actionpack (= 6.0.0)
actionview (= 6.0.0)
activejob (= 6.0.0)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (6.0.0)
actionview (= 6.0.0)
activesupport (= 6.0.0)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
actionpack-xml_parser (2.0.1)
actionpack (>= 5.0)
railties (>= 5.0)
actiontext (6.0.0)
actionpack (= 6.0.0)
activerecord (= 6.0.0)
activestorage (= 6.0.0)
activesupport (= 6.0.0)
nokogiri (>= 1.8.5)
actionview (6.0.0)
activesupport (= 6.0.0)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (6.0.0)
activesupport (= 6.0.0)
globalid (>= 0.3.6)
activemodel (6.0.0)
activesupport (= 6.0.0)
activemodel-serializers-xml (1.0.2)
activemodel (> 5.x)
activesupport (> 5.x)
builder (~> 3.1)
activerecord-import (0.28.1)
activerecord (6.0.0)
activemodel (= 6.0.0)
activesupport (= 6.0.0)
activerecord-import (1.0.2)
activerecord (>= 3.2)
activerecord-nulldb-adapter (0.3.9)
activerecord-nulldb-adapter (0.4.0)
activerecord (>= 2.0.0)
activerecord-session_store (1.1.1)
actionpack (>= 4.0)
@ -354,64 +293,78 @@ GEM
multi_json (~> 1.11, >= 1.11.2)
rack (>= 1.5.2, < 3)
railties (>= 4.0)
activestorage (6.0.0)
actionpack (= 6.0.0)
activejob (= 6.0.0)
activerecord (= 6.0.0)
marcel (~> 0.3.1)
activesupport (6.0.0)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
zeitwerk (~> 2.1, >= 2.1.8)
acts_as_list (0.9.19)
activerecord (>= 3.0)
acts_as_tree (2.8.0)
acts_as_tree (2.9.0)
activerecord (>= 3.0.0)
addressable (2.6.0)
public_suffix (>= 2.0.2, < 4.0)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
aes_key_wrap (1.0.1)
afm (0.2.2)
airbrake (8.0.1)
airbrake-ruby (~> 3.0)
airbrake-ruby (3.1.0)
tdigest (= 0.1.1)
airbrake (9.4.3)
airbrake-ruby (~> 4.6)
airbrake-ruby (4.6.0)
rbtree3 (~> 0.5)
ast (2.4.0)
attr_required (1.0.1)
autoprefixer-rails (9.4.7)
execjs
awesome_nested_set (3.2.0)
activerecord (>= 4.0.0, < 7.0)
aws-eventstream (1.0.1)
aws-partitions (1.136.0)
aws-sdk-core (3.46.0)
aws-eventstream (~> 1.0)
aws-eventstream (1.0.3)
aws-partitions (1.208.0)
aws-sdk-core (3.66.0)
aws-eventstream (~> 1.0, >= 1.0.2)
aws-partitions (~> 1.0)
aws-sigv4 (~> 1.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-kms (1.13.0)
aws-sdk-core (~> 3, >= 3.39.0)
aws-sigv4 (~> 1.0)
aws-sdk-s3 (1.30.1)
aws-sdk-core (~> 3, >= 3.39.0)
aws-sdk-kms (1.24.0)
aws-sdk-core (~> 3, >= 3.61.1)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.48.0)
aws-sdk-core (~> 3, >= 3.61.1)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.0)
aws-sigv4 (~> 1.1)
aws-sdk-sns (1.1.0)
aws-sdk-core (~> 3)
aws-sigv4 (~> 1.0)
aws-sigv4 (1.0.3)
aws-sigv4 (1.1.0)
aws-eventstream (~> 1.0, >= 1.0.2)
axiom-types (0.1.1)
descendants_tracker (~> 0.0.4)
ice_nine (~> 0.11.0)
thread_safe (~> 0.3, >= 0.3.1)
backports (3.15.0)
bcrypt (3.1.12)
backports (3.11.4)
bcrypt (3.1.13)
bindata (2.4.4)
binding_of_caller (0.8.0)
debug_inspector (>= 0.0.1)
bootsnap (1.3.2)
bootsnap (1.4.5)
msgpack (~> 1.0)
bourbon (6.0.0)
thor (~> 0.19)
brakeman (4.6.1)
browser (2.5.3)
browser (2.6.1)
builder (3.2.3)
byebug (10.0.2)
capybara (3.13.2)
byebug (11.0.1)
capybara (3.29.0)
addressable
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
regexp_parser (~> 1.2)
regexp_parser (~> 1.5)
xpath (~> 3.2)
capybara-screenshot (1.0.22)
capybara (>= 1.0, < 4)
@ -475,6 +428,7 @@ GEM
cucumber-tag_expressions (1.1.1)
cucumber-wire (0.0.1)
daemons (1.3.1)
dalli (2.7.10)
danger (6.0.9)
claide (~> 1.0)
claide-plugins (>= 0.9.2)
@ -518,7 +472,6 @@ GEM
declarative-option (< 0.2.0)
representable (>= 2.4.0, <= 3.1.0)
uber (< 0.2.0)
docile (1.3.1)
domain_name (0.5.20180417)
unf (>= 0.0.5, < 1.0.0)
equalizer (0.0.11)
@ -574,7 +527,7 @@ GEM
actionpack (>= 3.0)
multi_json
request_store (>= 1.0)
grape (1.2.3)
grape (1.2.4)
activesupport
builder
mustermann-grape (~> 1.0.0)
@ -582,10 +535,10 @@ GEM
rack-accept
virtus (>= 1.0.0)
gravatar_image_tag (1.2.0)
hashdiff (0.3.8)
hashdiff (1.0.0)
hashery (2.1.2)
hashie (3.6.0)
html-pipeline (2.8.3)
html-pipeline (2.12.0)
activesupport (>= 2)
nokogiri (>= 1.4)
htmldiff (0.0.1)
@ -603,11 +556,11 @@ GEM
interception (0.5)
ipaddress (0.8.3)
iso8601 (0.12.1)
jaro_winkler (1.5.2)
jaro_winkler (1.5.3)
jmespath (1.4.0)
jquery-tablesorter (1.27.0)
railties (~> 6.0.0, >= 3.2)
json (1.8.6)
json (2.2.0)
json-jwt (1.10.0)
activesupport (>= 4.2)
aes_key_wrap
@ -651,16 +604,16 @@ GEM
meta-tags (2.11.1)
actionpack (>= 3.2.0, < 6.1)
method_source (0.9.2)
mime-types (3.3)
mime-types (3.2.2)
mime-types-data (~> 3.2015)
mime-types-data (3.2019.0904)
mime-types-data (3.2018.0812)
mimemagic (0.3.3)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minisyntax (0.2.5)
minitest (5.11.3)
mixlib-shellout (2.1.0)
msgpack (1.2.6)
msgpack (1.3.1)
multi_json (1.13.1)
multi_test (0.1.2)
multipart-post (2.1.1)
@ -670,7 +623,7 @@ GEM
nap (1.1.0)
net-ldap (0.16.1)
netrc (0.11.0)
newrelic_rpm (6.0.0.351)
newrelic_rpm (6.6.0.358)
nio4r (2.5.1)
no_proxy_fix (0.1.2)
nokogiri (1.10.4)
@ -679,8 +632,8 @@ GEM
nokogiri (~> 1.8, >= 1.8.4)
octokit (4.14.0)
sawyer (~> 0.8.0, >= 0.5.3)
oj (3.7.8)
okcomputer (1.17.3)
oj (3.9.1)
okcomputer (1.17.4)
omniauth-saml (1.10.1)
omniauth (~> 1.3, >= 1.3.2)
ruby-saml (~> 1.7)
@ -696,12 +649,12 @@ GEM
validate_url
webfinger (>= 1.0.1)
openproject-token (1.0.2)
parallel (1.13.0)
parallel_tests (2.27.1)
parallel (1.17.0)
parallel_tests (2.29.2)
parallel
parser (2.6.0.0)
parser (2.6.4.0)
ast (~> 2.4.0)
passenger (6.0.1)
passenger (6.0.2)
rack
rake (>= 0.8.1)
pdf-core (0.7.0)
@ -719,7 +672,6 @@ GEM
nokogiri (~> 1.10, >= 1.10.4)
rubyzip (~> 1.2.1)
posix-spawn (0.3.13)
powerpack (0.1.2)
prawn (2.2.2)
pdf-core (~> 0.7.0)
ttfunk (~> 1.5)
@ -728,8 +680,8 @@ GEM
pry (0.12.2)
coderay (~> 1.1.0)
method_source (~> 0.9.0)
pry-byebug (3.6.0)
byebug (~> 10.0)
pry-byebug (3.7.0)
byebug (~> 11.0)
pry (~> 0.10)
pry-rails (0.3.9)
pry (>= 0.10.4)
@ -739,13 +691,13 @@ GEM
pry-stack_explorer (0.4.9.3)
binding_of_caller (>= 0.7)
pry (>= 0.9.11)
public_suffix (3.1.1)
puma (4.0.0)
public_suffix (4.0.1)
puma (4.1.0)
nio4r (~> 2.0)
rack (2.0.7)
rack-accept (0.4.5)
rack (>= 0.4)
rack-attack (5.4.2)
rack-attack (6.1.0)
rack (>= 1.0, < 3)
rack-mini-profiler (1.0.1)
rack (>= 1.2.0)
@ -755,13 +707,28 @@ GEM
httpclient
json-jwt (>= 1.9.0)
rack
rack-protection (2.0.5)
rack-protection (2.0.7)
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
rack_session_access (0.2.0)
builder (>= 2.0.0)
rack (>= 1.0.0)
rails (6.0.0)
actioncable (= 6.0.0)
actionmailbox (= 6.0.0)
actionmailer (= 6.0.0)
actionpack (= 6.0.0)
actiontext (= 6.0.0)
actionview (= 6.0.0)
activejob (= 6.0.0)
activemodel (= 6.0.0)
activerecord (= 6.0.0)
activestorage (= 6.0.0)
activesupport (= 6.0.0)
bundler (>= 1.3.0)
railties (= 6.0.0)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.4)
actionpack (>= 5.0.1.x)
actionview (>= 5.0.1.x)
@ -776,10 +743,16 @@ GEM
rails_stdout_logging
rails_serve_static_assets (0.0.5)
rails_stdout_logging (0.0.5)
railties (6.0.0)
actionpack (= 6.0.0)
activesupport (= 6.0.0)
method_source
rake (>= 0.8.7)
thor (>= 0.20.3, < 2.0)
rainbow (3.0.0)
raindrops (0.19.0)
rake (12.3.3)
rbtree (0.4.2)
rbtree3 (0.5.0)
rdoc (6.1.1)
recaptcha (5.1.0)
json
@ -833,14 +806,13 @@ GEM
rspec-retry (0.6.1)
rspec-core (> 3.3)
rspec-support (3.8.0)
rubocop (0.63.1)
rubocop (0.74.0)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.5, != 2.5.1.1)
powerpack (~> 0.1)
parser (>= 2.6)
rainbow (>= 2.2.2, < 4.0)
ruby-progressbar (~> 1.7)
unicode-display_width (~> 1.4.0)
unicode-display_width (>= 1.4.0, < 1.7)
ruby-duration (3.2.3)
activesupport (>= 3.0.0)
i18n
@ -848,14 +820,17 @@ GEM
ruby-enum (0.7.2)
i18n
ruby-ole (1.2.12.2)
ruby-prof (0.17.0)
ruby-progressbar (1.10.0)
ruby-prof (1.0.0)
ruby-progressbar (1.10.1)
ruby-rc4 (0.1.5)
ruby-saml (1.9.0)
nokogiri (>= 1.5.10)
rubytree (1.0.0)
json (~> 2.1)
structured_warnings (~> 0.3)
rubyzip (1.2.2)
safe_yaml (1.0.4)
sanitize (5.0.0)
safe_yaml (1.0.5)
sanitize (5.1.0)
crass (~> 1.0.2)
nokogiri (>= 1.8.0)
nokogumbo (~> 2.0)
@ -871,8 +846,7 @@ GEM
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
secure_headers (6.0.0)
useragent (>= 0.15.0)
secure_headers (6.1.1)
selenium-webdriver (3.141.0)
childprocess (~> 0.5)
rubyzip (~> 1.2, >= 1.2.2)
@ -880,15 +854,9 @@ GEM
shoulda-context (1.2.2)
shoulda-matchers (3.1.3)
activesupport (>= 4.0.0)
simplecov (0.16.1)
docile (~> 1.1)
json (>= 1.8, < 3)
simplecov-html (~> 0.10.0)
simplecov-html (0.10.2)
spreadsheet (0.8.9)
ruby-ole (>= 1.0)
spring (2.0.2)
activesupport (>= 4.2)
spring (2.1.0)
spring-commands-rspec (1.0.4)
spring (>= 0.9.1)
sprockets (3.7.2)
@ -900,6 +868,7 @@ GEM
sprockets (>= 3.0.0)
stackprof (0.2.12)
stringex (2.8.5)
structured_warnings (0.4.0)
svg-graph (2.1.3)
swd (1.1.2)
activesupport (>= 3)
@ -907,12 +876,10 @@ GEM
httpclient (>= 2.4)
sys-filesystem (1.2.0)
ffi
tdigest (0.1.1)
rbtree (~> 0.4.2)
temple (0.8.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
test-prof (0.7.3)
test-prof (0.10.0)
thin (1.7.2)
daemons (~> 1.0, >= 1.0.9)
eventmachine (~> 1.0, >= 1.0.4)
@ -932,14 +899,13 @@ GEM
unf (0.1.4)
unf_ext
unf_ext (0.0.7.5)
unicode-display_width (1.4.1)
unicorn (5.4.1)
unicode-display_width (1.6.0)
unicorn (5.5.1)
kgio (~> 2.6)
raindrops (~> 0.7)
unicorn-worker-killer (0.4.4)
get_process_mem (~> 0)
unicorn (>= 4, < 6)
useragent (0.16.10)
validate_email (0.1.6)
activemodel (>= 3.0)
mail (>= 2.2.5)
@ -962,14 +928,14 @@ GEM
webfinger (1.1.0)
activesupport
httpclient (>= 2.4)
webmock (3.5.1)
webmock (3.7.2)
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff
hashdiff (>= 0.4.0, < 2.0.0)
websocket-driver (0.7.1)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.4)
will_paginate (3.1.7)
will_paginate (3.1.8)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.1.10)
@ -980,23 +946,23 @@ PLATFORMS
DEPENDENCIES
actionpack-xml_parser (~> 2.0.0)
activemodel-serializers-xml (~> 1.0.1)
activerecord-import (~> 0.28.1)
activerecord-nulldb-adapter (~> 0.3.9)
activerecord-import (~> 1.0.2)
activerecord-nulldb-adapter (~> 0.4.0)
activerecord-session_store (~> 1.1.0)
acts_as_list (~> 0.9.9)
acts_as_tree (~> 2.8.0)
addressable (~> 2.6.0)
airbrake (~> 8.0.1)
acts_as_tree (~> 2.9.0)
addressable (~> 2.7.0)
airbrake (~> 9.4.3)
autoprefixer-rails (~> 9.4.5)
awesome_nested_set (~> 3.2.0)
aws-sdk-core (~> 3.46.0)
aws-sdk-s3 (~> 1.30.1)
aws-sdk-core (~> 3.66.0)
aws-sdk-s3 (~> 1.48.0)
bcrypt (~> 3.1.6)
bootsnap (~> 1.3.2)
bourbon!
bootsnap (~> 1.4.5)
bourbon (~> 6.0.0)
brakeman (~> 4.6.1)
browser (~> 2.5.3)
capybara (~> 3.13.0)
browser (~> 2.6.1)
capybara (~> 3.29.0)
capybara-screenshot (~> 1.0.17)
capybara-select2!
carrierwave (~> 1.3.1)
@ -1006,7 +972,7 @@ DEPENDENCIES
cucumber (~> 3.1.0)
cucumber-rails (~> 1.8.0)
daemons
dalli!
dalli (~> 2.7.10)
danger (~> 6.0.9)
danger-brakeman
dashboards!
@ -1027,7 +993,7 @@ DEPENDENCIES
gon (~> 6.2.1)
grape (~> 1.2.3)
grids!
html-pipeline (~> 2.8.0)
html-pipeline (~> 2.12.0)
htmldiff
i18n-js (~> 3.2.0)
json_spec (~> 1.1.4)
@ -1042,7 +1008,7 @@ DEPENDENCIES
net-ldap (~> 0.16.0)
newrelic_rpm
nokogiri (~> 1.10.4)
oj (~> 3.7.0)
oj (~> 3.9.1)
okcomputer (~> 1.17.3)
omniauth!
omniauth-openid-connect!
@ -1071,24 +1037,24 @@ DEPENDENCIES
openproject-webhooks!
openproject-xls_export!
overviews!
parallel_tests (~> 2.27.1)
parallel_tests (~> 2.29.2)
passenger (~> 6.0.1)
pg (~> 1.1.0)
plaintext (~> 0.3.2)
posix-spawn (~> 0.3.13)
prawn (~> 2.2)
prawn-table (~> 0.2.2)
pry-byebug (~> 3.6.0)
pry-byebug (~> 3.7.0)
pry-rails (~> 0.3.6)
pry-rescue (~> 1.5.0)
pry-stack_explorer (~> 0.4.9.2)
puma (~> 4.0.0)
rack-attack (~> 5.4.2)
puma (~> 4.1.0)
rack-attack (~> 6.1.0)
rack-mini-profiler
rack-protection (~> 2.0.0)
rack-test (~> 1.1.0)
rack_session_access
rails!
rails (~> 6.0.0)
rails-controller-testing (~> 1.0.2)
rails_12factor
rdoc (>= 2.4.2)
@ -1111,15 +1077,14 @@ DEPENDENCIES
ruby-duration (~> 3.2.0)
ruby-prof
ruby-progressbar (~> 1.10.0)
rubytree!
sanitize (~> 5.0.0)
rubytree (~> 1.0.0)
sanitize (~> 5.1.0)
sassc-rails (~> 2.1.0)
secure_headers (~> 6.0.0)
secure_headers (~> 6.1.1)
selenium-webdriver (~> 3.14)
semantic (~> 1.6.1)
shoulda-context (~> 1.2)
shoulda-matchers (~> 3.1)
simplecov (~> 0.16.0)
spring
spring-commands-rspec
sprockets (~> 3.7.0)
@ -1127,7 +1092,7 @@ DEPENDENCIES
stringex (~> 2.8.5)
svg-graph (~> 2.1.0)
sys-filesystem (~> 1.2.0)
test-prof (~> 0.7.3)
test-prof (~> 0.10.0)
thin (~> 1.7.2)
timecop (~> 0.9.0)
typed_dag (~> 2.0.2)
@ -1137,7 +1102,7 @@ DEPENDENCIES
warden (~> 1.2)
warden-basic_auth (~> 0.2.1)
webdrivers (~> 4.1.2)
webmock (~> 3.5.0)
webmock (~> 3.7.2)
will_paginate (~> 3.1.7)
RUBY VERSION

9
codecov.yml
Unescape View File

@ -1,9 +0,0 @@
coverage:
ignore:
- spec/factories/.*
- vendor/bundle/.*
status:
patch: false
project:
default: {}
comment: off

5
features/support/env.rb
Unescape View File

@ -34,11 +34,6 @@
# instead of editing this one. Cucumber will automatically load all features/**/*.rb
# files.
if ENV['COVERAGE']
require 'simplecov'
SimpleCov.start 'rails'
end
require 'cucumber/rails'
require 'cucumber/rspec/doubles'
require 'capybara-screenshot/cucumber'

10
lib/open_project/text_formatting/filters/sanitization_filter.rb
Unescape View File

@ -31,9 +31,13 @@
module OpenProject::TextFormatting
module Filters
class SanitizationFilter < HTML::Pipeline::SanitizationFilter
WHITELIST[:elements] << 'macro'
# Whitelist class and data-* attributes on all macros
WHITELIST[:attributes].merge!('macro' => ['class', :data])
def context
super.merge(whitelist: WHITELIST.merge(
elements: WHITELIST[:elements] + ['macro'],
# Whitelist class and data-* attributes on all macros
attributes: WHITELIST[:attributes].merge('macro' => ['class', :data])
))
end
end
end
end

9
lib/open_project/text_formatting/formats/base_formatter.rb
Unescape View File

@ -29,11 +29,12 @@
module OpenProject::TextFormatting::Formats
class BaseFormatter
attr_reader :options, :project
attr_reader :context,
:pipeline
def initialize(options)
@options = options
@project = options[:project]
def initialize(context)
@context = context
@pipeline = HTML::Pipeline.new(located_filters, context)
end
def to_html(text)

8
lib/open_project/text_formatting/formats/markdown/formatter.rb
Unescape View File

@ -31,14 +31,6 @@ require 'task_list/filter'
module OpenProject::TextFormatting::Formats::Markdown
class Formatter < OpenProject::TextFormatting::Formats::BaseFormatter
attr_reader :context,
:pipeline
def initialize(context)
@context = context
@pipeline = ::HTML::Pipeline.new(located_filters, context)
end
def to_html(text)
result = pipeline.call(text, context)
output = result[:output].to_s

8
lib/open_project/text_formatting/formats/plain/formatter.rb
Unescape View File

@ -31,14 +31,6 @@
module OpenProject::TextFormatting::Formats
module Plain
class Formatter < OpenProject::TextFormatting::Formats::BaseFormatter
attr_reader :context,
:pipeline
def initialize(context)
@context = context
@pipeline = HTML::Pipeline.new(located_filters, context)
end
def to_html(text)
pipeline.to_html(text, context).html_safe
end

2
spec/features/projects/destroy_spec.rb
Unescape View File

@ -52,7 +52,7 @@ describe 'Projects#destroy',
it 'can destroy the project' do
# Confirm the deletion
danger_zone.confirm_with(project.identifier)
expect(danger_zone.disabled?).to be false
expect(danger_zone).not_to be_disabled
danger_zone.danger_button.click
expect(page).to have_selector '.flash.notice', text: I18n.t('projects.delete.scheduled')

10
spec/features/projects/projects_index_spec.rb
Unescape View File

@ -539,10 +539,10 @@ describe 'Projects index page',
cf_filter = page.find("li[filter-name='cf_#{list_custom_field.id}']")
within(cf_filter) do
# Initial filter is a 'single select'
expect(cf_filter.find(:select, 'value')[:multiple]).to be_falsey
expect(cf_filter.find(:select, 'value')).not_to be_multiple
click_on 'Toggle multiselect'
# switching to multiselect keeps the current selection
expect(cf_filter.find(:select, 'value')[:multiple]).to be_truthy
expect(cf_filter.find(:select, 'value')).to be_multiple
expect(cf_filter).to have_select('value', selected: list_custom_field.possible_values[2].value)
select list_custom_field.possible_values[3].value, from: 'value'
@ -553,7 +553,7 @@ describe 'Projects index page',
cf_filter = page.find("li[filter-name='cf_#{list_custom_field.id}']")
within(cf_filter) do
# Query has two values for that filter, so it shoud show a 'multi select'.
expect(cf_filter.find(:select, 'value')[:multiple]).to be_truthy
expect(cf_filter.find(:select, 'value')).to be_multiple
expect(cf_filter)
.to have_select('value',
selected: [list_custom_field.possible_values[2].value,
@ -564,7 +564,7 @@ describe 'Projects index page',
unselect list_custom_field.possible_values[2].value, from: 'value'
click_on 'Toggle multiselect'
expect(cf_filter.find(:select, 'value')[:multiple]).to be_falsey
expect(cf_filter.find(:select, 'value')).not_to be_multiple
expect(cf_filter).to have_select('value', selected: list_custom_field.possible_values[1].value)
expect(cf_filter).to_not have_select('value', selected: list_custom_field.possible_values[3].value)
end
@ -574,7 +574,7 @@ describe 'Projects index page',
cf_filter = page.find("li[filter-name='cf_#{list_custom_field.id}']")
within(cf_filter) do
# Query has one value for that filter, so it should show a 'single select'.
expect(cf_filter.find(:select, 'value')[:multiple]).to be_falsey
expect(cf_filter.find(:select, 'value')).not_to be_multiple
end
# CF date filter work (at least for one operator)

6
spec/features/repositories/create_repository_spec.rb
Unescape View File

@ -108,7 +108,7 @@ describe 'Create repository', type: :feature, js: true, selenium: true do
it 'should display a collapsed type' do
expect(selector).not_to be_nil
expect(selector[:selected]).to be_falsey
expect(selector[:disabled]).to be_falsey
expect(selector).not_to be_disabled
content = find("##{vendor}-#{type}", visible: false)
expect(content).not_to be_nil
@ -124,7 +124,7 @@ describe 'Create repository', type: :feature, js: true, selenium: true do
find("input[name='scm_type'][value='#{type}']").set(true)
content = find("#attributes-group--content-#{type}")
expect(content).not_to be_nil
expect(content[:hidden]).to be_falsey
expect(content[:hidden]).to eql 'false'
content = find("##{vendor}-#{type}", visible: false)
expect(content).not_to be_nil
expect(content[:style]).not_to match("display: none")
@ -132,7 +132,7 @@ describe 'Create repository', type: :feature, js: true, selenium: true do
find('input[type="radio"][value="managed"]').set(true)
content = find('#attributes-group--content-managed')
expect(content).not_to be_nil
expect(content[:hidden]).to be_falsey
expect(content[:hidden]).to eql 'false'
content = find("##{vendor}-managed", visible: false)
expect(content).not_to be_nil
expect(content[:style]).not_to match("display: none")

2
spec/features/support/components/danger_zone.rb
Unescape View File

@ -65,6 +65,6 @@ class DangerZone
##
def disabled?
!!danger_button[:disabled]
danger_button.disabled?
end
end

16
spec/features/users/my_spec.rb
Unescape View File

@ -35,10 +35,10 @@ describe 'my',
let(:user_password) { 'bob' * 4 }
let(:user) do
FactoryBot.create(:user,
mail: 'old@mail.com',
login: 'bob',
password: user_password,
password_confirmation: user_password)
mail: 'old@mail.com',
login: 'bob',
password: user_password,
password_confirmation: user_password)
end
##
@ -98,11 +98,11 @@ describe 'my',
end
context 'as admin' do
let(:user) {
let(:user) do
FactoryBot.create :admin,
password: user_password,
password_confirmation: user_password
}
password: user_password,
password_confirmation: user_password
end
it 'requires the password' do
dialog.confirm_flow_with(user_password)

7
spec/features/work_packages/details/milestones_spec.rb
Unescape View File

@ -1,15 +1,14 @@
require 'spec_helper'
describe 'Milestones full screen v iew', js: true do
let(:type) { FactoryBot.create :type, is_milestone: true }
let(:project) { FactoryBot.create(:project, types: [type]) }
let!(:work_package) {
let!(:work_package) do
FactoryBot.create(:work_package,
project: project,
type: type,
subject: 'Foobar')
}
end
let(:wp_page) { ::Pages::FullWorkPackage.new(work_package, project) }
let(:button) { find('.add-work-package', wait: 5) }
@ -29,7 +28,7 @@ describe 'Milestones full screen v iew', js: true do
end
it 'shows the button as enabled' do
expect(button['disabled']).to be_falsey
expect(button).not_to be_disabled
button.click
expect(page).to have_selector('.menu-item', text: type.name.upcase)

7
spec/rails_helper.rb
Unescape View File

@ -34,13 +34,6 @@ require 'shoulda/matchers'
require 'rspec/example_disabler'
require 'test_prof/recipes/rspec/before_all'
##
# Start collecting coverage when desired
if ENV['COVERAGE']
require 'simplecov'
SimpleCov.start 'rails'
end
# Requires supporting ruby files with custom matchers and macros, etc, in
# spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
# run as spec files by default. This means that files in spec/support that end

4
spec/support/components/password_confirmation_dialog.rb
Unescape View File

@ -36,10 +36,10 @@ module Components
def confirm_flow_with(password, should_fail: false)
expect_open
expect(submit_button[:disabled]).to be_truthy
expect(submit_button).to be_disabled
fill_in 'request_for_confirmation_password', with: password
expect(submit_button[:disabled]).to be_falsey
expect(submit_button).not_to be_disabled
submit(should_fail)
end

Write Preview
Loading…
Cancel
Save