Merge pull request #1217 from maurogeorge/patch-04

Change default rake task to run test and rubocop

.travis.yml

@@ -18,7 +18,6 @@ install:
 
 script:
   - env CAPTURE_STDERR=false bundle exec rake
-  - bundle exec rake rubocop
 
 env:
   - "RAILS_VERSION=4.0"

Rakefile

@@ -36,4 +36,4 @@ Rake::TestTask.new do |t|
   t.verbose = true
 end
 
-task :default => :test
+task default: [:test, :rubocop]

appveyor.yml

@@ -21,6 +21,6 @@ install:
   - bundle install --retry=3
 
 test_script:
-  - bundle exec rake
+  - bundle exec rake test
 
 build: off