Skip to content

Commit

Permalink
cleaning up gemfile. rubocop complains about something i do not get
Browse files Browse the repository at this point in the history
  • Loading branch information
GBH committed Dec 21, 2017
1 parent 098aeb8 commit cabc6cf
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 12 deletions.
16 changes: 9 additions & 7 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,22 @@ source "http://rubygems.org"

gemspec

# apps can also use will_paginate so there's no dependency in gemspec
gem "kaminari"
group :development, :test do
gem "byebug", platforms: %i[mri mingw x64_mingw]
gem "capybara"
gem "kaminari"
gem "rubocop", require: false
gem "selenium-webdriver"
gem "sqlite3"
end

group :development do
gem "awesome_print"
gem "better_errors"
gem "binding_of_caller"
gem "listen"
gem "rubocop", "~> 0.51.0", require: false
gem "web-console"
end

group :test do
gem "coveralls", require: false
gem "mocha", require: false
gem "rails-controller-testing"
gem "sqlite3"
end
2 changes: 1 addition & 1 deletion lib/comfortable_mexican_sofa/extensions/acts_as_tree.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def cms_acts_as_tree(options = {})
foreign_key: configuration[:foreign_key],
dependent: configuration[:dependent]

class_eval <<-RUBY
class_eval <<-RUBY, __FILE__, __LINE__ + 1
include ComfortableMexicanSofa::ActsAsTree::InstanceMethods
scope :roots, -> {
Expand Down
2 changes: 1 addition & 1 deletion lib/comfortable_mexican_sofa/extensions/has_revisions.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ def self.included(base)
module ClassMethods

def cms_has_revisions_for(*fields)
include ComfortableMexicanSofa::HasRevisions::InstanceMethods
include ComfortableMexicanSofa::HasRevisions::InstanceMethods # rubocop:disable Style/MixinUsage

attr_accessor :revision_data

Expand Down
11 changes: 8 additions & 3 deletions test/gemfiles/Gemfile.rails.5.2
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,16 @@ source 'http://rubygems.org'

gemspec path: "../../"

gem 'kaminari', '>= 0.14.0'
group :development, :test do
gem "byebug", platforms: %i[mri mingw x64_mingw]
gem "capybara"
gem "kaminari"
gem "rubocop", require: false
gem "selenium-webdriver"
gem "sqlite3"
end

group :test do
gem "rubocop", "~> 0.51.0", require: false
gem "sqlite3"
gem "coveralls", require: false
gem "mocha", require: false
gem "rails-controller-testing"
Expand Down

0 comments on commit cabc6cf

Please sign in to comment.