Merge 8d46e52 into 18e82b8

smartinez87 · Jan 24, 2019 · 9cb85b6 · 9cb85b6
2 parents 18e82b8 + 8d46e52
commit 9cb85b6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -3,3 +3,5 @@ inherit_from: .rubocop_todo.yml
 AllCops:
   TargetRubyVersion: 2.0
   DisplayCopNames: true
+  Exclude:
+    - "gemfiles/**/*"
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,5 @@
 language: ruby
+cache: bundler
 rvm:
   - 2.1.10
   - 2.2.9
@@ -12,9 +13,12 @@ before_install:
   - gem install bundler -v '< 2'
 
 install:
-  - "bundle install --jobs=3 --retry=3"
+  - "bundle install --jobs=3 --retry=3 --path=vendor/bundle"
   - "mkdir -p test/dummy/tmp/cache"
   - "mkdir -p test/dummy/tmp/non_default_location"
+script:
+  - bundle exec rake test
+  - bundle exec rubocop
 gemfile:
   - gemfiles/rails4_0.gemfile
   - gemfiles/rails4_1.gemfile

diff --git a/Rakefile b/Rakefile
@@ -11,5 +11,5 @@ Rake::TestTask.new(:test) do |t|
   t.libs << 'lib'
   t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
+  t.warning = false
 end