Update travis and rubocop to work together

This commit is contained in:
Artem Chernikov 2014-07-21 15:57:54 +02:00
parent 98e9dec252
commit 949ce14fca
3 changed files with 4 additions and 4 deletions

1
.gitignore vendored
View file

@ -28,4 +28,3 @@ pickle-email-*.html
/bundle /bundle
/doc/app /doc/app
.ruby-version .ruby-version
rubocop.yml

View file

@ -85,4 +85,5 @@ AllCops:
- '**/Rakefile' - '**/Rakefile'
- '**/config.ru' - '**/config.ru'
Exclude: Exclude:
- db/schema.rb - 'db/schema.rb'
- 'vendor/bundle/**/*'

View file

@ -16,5 +16,5 @@ before_script:
- cp config/secrets.yml.example config/secrets.yml - cp config/secrets.yml.example config/secrets.yml
- RAILS_ENV=test bundle exec rake db:migrate --trace - RAILS_ENV=test bundle exec rake db:migrate --trace
script: script:
- bundle exec rspec --color --format documentation - 'bundle exec rspec --color --format documentation'
- bundle exec rubocop -Dc .rubocop.yml - 'bundle exec rubocop -Dc .rubocop.yml'