Fix dependencies, test against Rails 6.

.rubocop_todo.yml

@@ -1,11 +1,54 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2015-08-19 12:23:54 -0400 using RuboCop version 0.38.0.
+# on 2019-12-08 10:39:57 -0500 using RuboCop version 0.77.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: 8
+# Configuration parameters: Include.
+# Include: **/*.gemfile, **/Gemfile, **/gems.rb
+Bundler/DuplicatedGem:
+  Exclude:
+    - 'Gemfile'
+
+# Offense count: 8
+# Cop supports --auto-correct.
+# Configuration parameters: TreatCommentsAsGroupSeparators, Include.
+# Include: **/*.gemfile, **/Gemfile, **/gems.rb
+Bundler/OrderedGems:
+  Exclude:
+    - 'Gemfile'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Layout/EmptyLineAfterGuardClause:
+  Exclude:
+    - 'app/controllers/grape_swagger_rails/application_controller.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Layout/EmptyLineAfterMagicComment:
+  Exclude:
+    - 'grape-swagger-rails.gemspec'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Layout/EmptyLinesAroundArguments:
+  Exclude:
+    - 'lib/grape-swagger-rails.rb'
+
+# Offense count: 12
+# Cop supports --auto-correct.
+# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
+# SupportedHashRocketStyles: key, separator, table
+# SupportedColonStyles: key, separator, table
+# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
+Layout/HashAlignment:
+  Exclude:
+    - 'lib/grape-swagger-rails.rb'
+
 # Offense count: 1
 Lint/AmbiguousRegexpLiteral:
   Exclude:
@@ -18,44 +61,119 @@ Lint/AssignmentInCondition:
     - 'spec/dummy/bin/spring'
 
 # Offense count: 2
-Lint/HandleExceptions:
+# Cop supports --auto-correct.
+Lint/ScriptPermission:
+  Exclude:
+    - 'Rakefile'
+    - 'spec/dummy/Rakefile'
+
+# Offense count: 2
+# Configuration parameters: AllowComments.
+Lint/SuppressedException:
   Exclude:
     - 'spec/dummy/bin/rails'
     - 'spec/dummy/bin/rake'
 
-# Offense count: 31
-# Configuration parameters: AllowURI, URISchemes.
-Metrics/LineLength:
-  Max: 129
+# Offense count: 9
+# Configuration parameters: CountComments, ExcludedMethods.
+# ExcludedMethods: refine
+Metrics/BlockLength:
+  Max: 282
+
+# Offense count: 2
+# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms.
+# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
+Naming/FileName:
+  Exclude:
+    - 'lib/grape-swagger-rails.rb'
+    - 'spec/features/grape-swagger-rails_spec.rb'
 
 # Offense count: 2
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
+# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, IgnoredMethods, AllowBracesOnProceduralOneLiners.
+# SupportedStyles: line_count_based, semantic, braces_for_chaining, always_braces
+# ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
+# FunctionalMethods: let, let!, subject, watch
+# IgnoredMethods: lambda, proc, it
 Style/BlockDelimiters:
-  Enabled: false
+  Exclude:
+    - 'lib/tasks/swagger_ui.rake'
 
-# Offense count: 9
+# Offense count: 4
 Style/Documentation:
   Exclude:
+    - 'spec/**/*'
+    - 'test/**/*'
     - 'app/controllers/grape_swagger_rails/application_controller.rb'
     - 'lib/grape-swagger-rails.rb'
     - 'lib/grape-swagger-rails/engine.rb'
-    - 'lib/grape-swagger-rails/version.rb'
-    - 'spec/dummy/app/api/api.rb'
-    - 'spec/dummy/app/controllers/application_controller.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: compact, expanded
+Style/EmptyMethod:
+  Exclude:
+    - 'app/controllers/grape_swagger_rails/application_controller.rb'
     - 'spec/dummy/app/controllers/welcome_controller.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/Encoding:
+  Exclude:
+    - 'grape-swagger-rails.gemspec'
+
+# Offense count: 14
+# Cop supports --auto-correct.
+Style/ExpandPathArguments:
+  Exclude:
+    - 'Rakefile'
+    - 'grape-swagger-rails.gemspec'
+    - 'lib/script/rails'
+    - 'lib/tasks/swagger_ui.rake'
+    - 'spec/dummy/Rakefile'
+    - 'spec/dummy/bin/bundle'
+    - 'spec/dummy/bin/rails'
+    - 'spec/dummy/bin/rake'
     - 'spec/dummy/config/application.rb'
+    - 'spec/dummy/config/boot.rb'
+    - 'spec/dummy/config/environment.rb'
+    - 'spec/spec_helper.rb'
 
-# Offense count: 2
-# Configuration parameters: Exclude.
-Style/FileName:
+# Offense count: 37
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: always, never
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: PreferredDelimiters.
+Style/PercentLiteralDelimiters:
   Exclude:
+    - 'grape-swagger-rails.gemspec'
     - 'lib/grape-swagger-rails.rb'
-    - 'spec/features/grape-swagger-rails_spec.rb'
+    - 'spec/features/swagger_spec.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
+# Configuration parameters: EnforcedStyle, AllowInnerSlashes.
+# SupportedStyles: slashes, percent_r, mixed
 Style/RegexpLiteral:
   Exclude:
     - 'lib/tasks/swagger_ui.rake'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: MinSize.
+# SupportedStyles: percent, brackets
+Style/SymbolArray:
+  EnforcedStyle: brackets
+
+# Offense count: 48
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 129

.travis.yml

@@ -9,45 +9,37 @@ before_install:
   - mkdir geckodriver
   - tar -xzf geckodriver-v0.18.0-linux64.tar.gz -C geckodriver
   - export PATH=$PATH:$PWD/geckodriver
-  - gem install bundler -v'< 2'
-
-before_script:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
-  - sleep 3 # give xvfb some time to start
 
 language: ruby
 
 cache: bundler
 
 matrix:
   include:
-    - rvm: 2.3.1
+    - rvm: 2.5.6
       script:
         - bundle exec danger
-    - rvm: 2.3.1
+    - rvm: 2.5.6
       env:
         - GRAPE_SWAGGER_VERSION=0.8.0
-    - rvm: 2.3.1
+    - rvm: 2.5.6
       env:
         - GRAPE_SWAGGER_VERSION=0.9.0
-    - rvm: 2.3.1
+    - rvm: 2.5.6
       env:
         - GRAPE_SWAGGER_VERSION=0.11.0
-    - rvm: 2.3.1
+    - rvm: 2.5.6
       env:
         - GRAPE_SWAGGER_VERSION=0.20.2
-    - rvm: 2.3.1
+    - rvm: 2.5.6
+      env:
+        - GRAPE_SWAGGER_VERSION=0.33.0
+    - rvm: 2.5.6
       env:
         - GRAPE_SWAGGER_VERSION=HEAD
-    - rvm: 2.3.0
-    - rvm: 2.2.5
-    - rvm: 2.0.0
-    - rvm: rbx-2
     - rvm: ruby-head
     - rvm: jruby-head
   allow_failures:
     - env: GRAPE_SWAGGER_VERSION=HEAD
     - rvm: ruby-head
     - rvm: jruby-head
-    - rvm: rbx-2

CHANGELOG.md

@@ -1,5 +1,7 @@
 ### Next Release
 
+* [#98](https://github.com/ruby-grape/grape-swagger-rails/pull/98): Fix: test against Rails 6 - [@dblock](https://github.com/dblock).
+
 * Your contribution here.
 
 ### 0.3.1 (February 16, 2019)

Gemfile

@@ -4,7 +4,7 @@ gemspec
 
 case version = ENV['GRAPE_SWAGGER_VERSION'] || '~> 0.9.0'
 when 'HEAD'
-  gem 'grape-swagger', github: 'tim-vandecasteele/grape-swagger'
+  gem 'grape-swagger', github: 'ruby-grape/grape-swagger'
 when '0.8.0'
   gem 'grape', '0.9.0'
   gem 'grape-swagger', '0.8.0'
@@ -21,6 +21,23 @@ else
   gem 'grape-swagger', version
 end
 
-group :test do
+group :development, :test do
   gem 'ruby-grape-danger', '~> 0.1.0', require: false
+  gem 'rake'
+  gem 'rspec-rails'
+  gem 'capybara'
+  gem 'selenium-webdriver'
+  gem 'sass'
+  gem 'sass-rails'
+  gem 'uglifier'
+  gem 'coffee-rails'
+  gem 'jquery-rails'
+  gem 'grape-swagger-ui'
+  gem 'sprockets'
+  gem 'rack', '~> 1.6'
+  gem 'rack-cors'
+  gem 'rubocop', '0.77.0'
+  gem 'mime-types', '< 3.0'
+  gem 'rack-no_animations'
+  gem 'nokogiri'
 end

grape-swagger-rails.gemspec

@@ -17,25 +17,4 @@ Gem::Specification.new do |spec|
   spec.require_paths = %w(lib)
 
   spec.add_dependency 'railties', '>= 3.2.12'
-
-  spec.add_development_dependency 'bundler', '~> 1.15'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'git'
-  spec.add_development_dependency 'rspec-rails'
-  spec.add_development_dependency 'capybara'
-  spec.add_development_dependency 'grape'
-  spec.add_development_dependency 'grape-swagger', '>= 0.7.2'
-  spec.add_development_dependency 'selenium-webdriver'
-  spec.add_development_dependency 'sass-rails'
-  spec.add_development_dependency 'uglifier'
-  spec.add_development_dependency 'coffee-rails'
-  spec.add_development_dependency 'jquery-rails'
-  spec.add_development_dependency 'grape-swagger-ui'
-  spec.add_development_dependency 'sprockets'
-  spec.add_development_dependency 'rack', '~> 1.6'
-  spec.add_development_dependency 'rack-cors'
-  spec.add_development_dependency 'rubocop', '0.38.0'
-  spec.add_development_dependency 'mime-types', '< 3.0'
-  spec.add_development_dependency 'rack-no_animations'
-  spec.add_development_dependency 'nokogiri', '< 1.7.0'
 end

spec/dummy/app/assets/config/manifest.js

@@ -0,0 +1,4 @@
+//= link application.js
+//= link application.css
+//= link grape_swagger_rails/application.css
+//= link grape_swagger_rails/application.js

spec/support/capybara.rb

@@ -3,3 +3,4 @@
 
 Capybara.default_driver = :selenium
 Capybara.server_port = 3000
+Capybara.server = :webrick