jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/395506 )
Change subject: Update RuboCop Ruby gem ...................................................................... Update RuboCop Ruby gem Bug: T180878 Change-Id: I093e232d7af1f22d9d7da5ef1f0201e842ac0d3d --- M .rubocop_todo.yml M tests/browser/Gemfile M tests/browser/Gemfile.lock 3 files changed, 101 insertions(+), 60 deletions(-) Approvals: WMDE-leszek: Looks good to me, approved jenkins-bot: Verified Thiemo Mättig (WMDE): Looks good to me, but someone else must approve diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 2f8db48..7e5a3e3 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,26 +1,52 @@ -# This configuration was generated by `rubocop --auto-gen-config` -# on 2014-11-13 12:15:50 +0100 using RuboCop version 0.27.1. +# This configuration was generated by +# `rubocop --auto-gen-config` +# on 2017-12-05 13:00:54 +0100 using RuboCop version 0.51.0. # The point is for the user to remove these configuration records # one by one as the offenses are removed from the code base. # Note that changes in the inspected code, or installation of new # versions of RuboCop, may require this file to be generated again. -# Offense count: 164 -# Configuration parameters: AllowURI, URISchemes. +# Offense count: 48 +# Cop supports --auto-correct. +Layout/EmptyLineAfterMagicComment: + Enabled: false + +# Offense count: 241 +# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns. +# URISchemes: http, https Metrics/LineLength: - Max: 465 + Max: 464 + +# Offense count: 48 +# Cop supports --auto-correct. +Style/Encoding: + Enabled: false # Offense count: 2 # Configuration parameters: MinBodyLength. Style/GuardClause: - Enabled: false + Exclude: + - 'tests/browser/features/support/modules/uls_module.rb' + - 'tests/browser/features/support/pages/login_page.rb' -# Offense count: 9 +# Offense count: 7 +# Cop supports --auto-correct. # Configuration parameters: MaxLineLength. Style/IfUnlessModifier: - Enabled: false + Exclude: + - 'tests/browser/features/support/env.rb' + - 'tests/browser/features/support/modules/alias_module.rb' + - 'tests/browser/features/support/modules/entity_module.rb' + - 'tests/browser/features/support/modules/reference_module.rb' + - 'tests/browser/features/support/modules/sitelink_module.rb' + - 'tests/browser/features/support/pages/login_page.rb' -# Offense count: 1 -# Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles. -Style/Next: - Enabled: false +# Offense count: 2 +# Cop supports --auto-correct. +# Configuration parameters: AutoCorrect, EnforcedStyle, SupportedStyles. +# SupportedStyles: predicate, comparison +Style/NumericPredicate: + Exclude: + - 'spec/**/*' + - 'tests/browser/features/step_definitions/aliases_steps.rb' + - 'tests/browser/features/support/modules/entity_module.rb' diff --git a/tests/browser/Gemfile b/tests/browser/Gemfile index 37f232a..f86d41e 100644 --- a/tests/browser/Gemfile +++ b/tests/browser/Gemfile @@ -1,9 +1,17 @@ source 'https://rubygems.org' gem 'activesupport', '~> 4.2', '>= 4.2.6' +# Locking data_magic to version 1.1 because 1.2 requires Ruby version >= 2.2 and +# Jenkins is on 2.1.0 +gem 'data_magic', '~> 1.1.0' gem 'mediawiki_api-wikidata', '~> 0.2.0', '>= 0.2.1' gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.1' gem 'parallel_tests', '~> 2.5' -gem 'rake', '~> 11.1', '>= 11.1.2' +# Locking rake to version 11.1 because Jenkins is failing with: +# NameError: uninitialized constant MediawikiSelenium::RakeTask::Shellwords +gem 'rake', '~> 11.1.0', '>= 11.1.2' gem 'require_all', '~> 1.3', '>= 1.3.3' -gem 'rubocop', '~> 0.40.0', require: false +gem 'rubocop', '~> 0.51.0', require: false +# Locking Selenium to version 2 because Jenkins is failing with: +# Unable to find Mozilla geckodriver +gem 'selenium-webdriver', '~> 2.53', '>= 2.53.4' diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock index 3ac408b..6201555 100644 --- a/tests/browser/Gemfile.lock +++ b/tests/browser/Gemfile.lock @@ -1,43 +1,44 @@ GEM remote: https://rubygems.org/ specs: - activesupport (4.2.6) + activesupport (4.2.10) i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - ast (2.2.0) - builder (3.2.2) - childprocess (0.5.9) + ast (2.3.0) + builder (3.2.3) + childprocess (0.8.0) ffi (~> 1.0, >= 1.0.11) + concurrent-ruby (1.0.5) cucumber (1.3.20) builder (>= 2.1.2) diff-lcs (>= 1.1.3) gherkin (~> 2.12) multi_json (>= 1.7.5, < 2.0) multi_test (>= 0.1.2) - data_magic (0.22) + data_magic (1.1) faker (>= 1.1.2) yml_reader (>= 0.6) - diff-lcs (1.2.5) - domain_name (0.5.20160310) + diff-lcs (1.3) + domain_name (0.5.20170404) unf (>= 0.0.5, < 1.0.0) - faker (1.6.3) + faker (1.8.4) i18n (~> 0.5) - faraday (0.9.2) + faraday (0.13.1) multipart-post (>= 1.2, < 3) faraday-cookie_jar (0.0.6) faraday (>= 0.7.4) http-cookie (~> 1.0.0) - ffi (1.9.10) + ffi (1.9.18) gherkin (2.12.2) multi_json (~> 1.3) - headless (2.2.3) - http-cookie (1.0.2) + headless (2.3.1) + http-cookie (1.0.3) domain_name (~> 0.5) - i18n (0.7.0) - json (1.8.3) + i18n (0.9.1) + concurrent-ruby (~> 1.0) + json (1.8.6) mediawiki_api (0.6.0) faraday (~> 0.9, >= 0.9.0) faraday-cookie_jar (~> 0.0, >= 0.0.6) @@ -54,27 +55,30 @@ rspec-expectations (~> 2.14, >= 2.14.4) syntax (~> 1.2, >= 1.2.0) thor (~> 0.19, >= 0.19.1) - mime-types (2.99.2) - minitest (5.8.4) - multi_json (1.12.1) + mime-types (2.99.3) + minitest (5.10.3) + multi_json (1.12.2) multi_test (0.1.2) multipart-post (2.0.0) + net-http-persistent (2.9.4) netrc (0.11.0) - page-object (1.1.1) + page-object (1.2.2) + net-http-persistent (~> 2.9.4) page_navigation (>= 0.9) - selenium-webdriver (>= 2.44.0) - watir-webdriver (>= 0.6.11) - page_navigation (0.9) - data_magic (>= 0.14) - parallel (1.8.0) - parallel_tests (2.5.0) + selenium-webdriver (>= 2.53.0) + watir-webdriver (>= 0.6.11, < 0.9.9) + page_navigation (0.10) + data_magic (>= 0.22) + parallel (1.12.0) + parallel_tests (2.19.0) parallel - parser (2.3.1.0) - ast (~> 2.2) + parser (2.4.0.2) + ast (~> 2.3) powerpack (0.1.1) - rainbow (2.1.0) + rainbow (2.2.2) + rake rake (11.1.2) - require_all (1.3.3) + require_all (1.4.0) rest-client (1.8.0) http-cookie (>= 1.0.2, < 2.0) mime-types (>= 1.16, < 3.0) @@ -82,30 +86,31 @@ rspec-core (2.99.2) rspec-expectations (2.99.2) diff-lcs (>= 1.1.3, < 2.0) - rubocop (0.40.0) - parser (>= 2.3.1.0, < 3.0) + rubocop (0.51.0) + parallel (~> 1.10) + parser (>= 2.3.3.1, < 3.0) powerpack (~> 0.1) - rainbow (>= 1.99.1, < 3.0) + rainbow (>= 2.2.2, < 3.0) ruby-progressbar (~> 1.7) unicode-display_width (~> 1.0, >= 1.0.1) - ruby-progressbar (1.8.0) - rubyzip (1.2.0) - selenium-webdriver (2.53.0) + ruby-progressbar (1.9.0) + rubyzip (1.2.1) + selenium-webdriver (2.53.4) childprocess (~> 0.5) rubyzip (~> 1.0) websocket (~> 1.0) - syntax (1.2.0) - thor (0.19.1) - thread_safe (0.3.5) - tzinfo (1.2.2) + syntax (1.2.2) + thor (0.20.0) + thread_safe (0.3.6) + tzinfo (1.2.4) thread_safe (~> 0.1) unf (0.1.4) unf_ext - unf_ext (0.0.7.2) - unicode-display_width (1.0.5) - watir-webdriver (0.9.1) + unf_ext (0.0.7.4) + unicode-display_width (1.3.0) + watir-webdriver (0.9.3) selenium-webdriver (>= 2.46.2) - websocket (1.2.3) + websocket (1.2.5) yml_reader (0.7) PLATFORMS @@ -113,12 +118,14 @@ DEPENDENCIES activesupport (~> 4.2, >= 4.2.6) + data_magic (~> 1.1.0) mediawiki_api-wikidata (~> 0.2.0, >= 0.2.1) mediawiki_selenium (~> 1.7, >= 1.7.1) parallel_tests (~> 2.5) - rake (~> 11.1, >= 11.1.2) + rake (~> 11.1.0, >= 11.1.2) require_all (~> 1.3, >= 1.3.3) - rubocop (~> 0.40.0) + rubocop (~> 0.51.0) + selenium-webdriver (~> 2.53, >= 2.53.4) BUNDLED WITH - 1.12.5 + 1.16.0 -- To view, visit https://gerrit.wikimedia.org/r/395506 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I093e232d7af1f22d9d7da5ef1f0201e842ac0d3d Gerrit-PatchSet: 6 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Zfilipin <zfili...@wikimedia.org> Gerrit-Reviewer: Addshore <addshorew...@gmail.com> Gerrit-Reviewer: Hashar <has...@free.fr> Gerrit-Reviewer: Thiemo Mättig (WMDE) <thiemo.kr...@wikimedia.de> Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de> Gerrit-Reviewer: WMDE-Fisch <christoph.jau...@wikimedia.de> Gerrit-Reviewer: WMDE-leszek <leszek.mani...@wikimedia.de> Gerrit-Reviewer: Zfilipin <zfili...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
