diff --git a/gemfiles/rails_5.gemfile b/gemfiles/rails_5.gemfile index 708f5499..931bfa16 100644 --- a/gemfiles/rails_5.gemfile +++ b/gemfiles/rails_5.gemfile @@ -3,18 +3,11 @@ source "https://rubygems.org" gem "rails", "< 5.2.3" - -group :development, :test do - gem "puma" - gem "teaspoon-jasmine", path: "../teaspoon-jasmine" - gem "teaspoon-mocha", path: "../teaspoon-mocha" - gem "teaspoon-qunit", path: "../teaspoon-qunit" - gem "selenium-webdriver" - gem "capybara-webkit" - gem "simplecov", require: false - gem "rubocop", require: false - - gemspec name: "teaspoon-devkit", path: "../" -end +gem "teaspoon-jasmine", path: "../teaspoon-jasmine" +gem "teaspoon-mocha", path: "../teaspoon-mocha" +gem "teaspoon-qunit", path: "../teaspoon-qunit" +gem "rubocop", require: false +gem "rubocop-rails_config" gemspec name: "teaspoon", path: "../" +gemspec name: "teaspoon-devkit", path: "../" diff --git a/gemfiles/rails_6.gemfile b/gemfiles/rails_6.gemfile index 516ae1c7..1fce15b7 100644 --- a/gemfiles/rails_6.gemfile +++ b/gemfiles/rails_6.gemfile @@ -1,17 +1,13 @@ -source "https://rubygems.org" +# This file was generated by Appraisal -gem "rails", "6.0.0.beta1" +source "https://rubygems.org" -group :development, :test do - gem "puma" - gem "teaspoon-jasmine", path: "../teaspoon-jasmine" - gem "teaspoon-mocha", path: "../teaspoon-mocha" - gem "teaspoon-qunit", path: "../teaspoon-qunit" - gem "selenium-webdriver" - gem "capybara-webkit" - gem "simplecov", require: false - gem "rubocop", require: false - gemspec name: "teaspoon-devkit", path: "../" -end +gem "rails", "6.0.0.beta3" +gem "teaspoon-jasmine", path: "../teaspoon-jasmine" +gem "teaspoon-mocha", path: "../teaspoon-mocha" +gem "teaspoon-qunit", path: "../teaspoon-qunit" +gem "rubocop", require: false +gem "rubocop-rails_config" gemspec name: "teaspoon", path: "../" +gemspec name: "teaspoon-devkit", path: "../" diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index f999e4fd..d191b871 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -4,12 +4,9 @@ filters.clear - add_filter { |src| - filtered = !(src.filename =~ /teaspoon\//) - puts src.filename unless filtered - filtered - } + add_filter { |src| !(src.filename =~ /teaspoon\//) } add_filter [ + "gemfiles", # appraisal installs gems here "teaspoon_env.rb", # teaspoon envs "devkit.rb", # devkit tools "framework.rb", # framework definitions