Skip to content

Commit

Permalink
Run integration tests on Travis-CI.
Browse files Browse the repository at this point in the history
  • Loading branch information
dblock committed Feb 5, 2016
1 parent 6c44bbd commit 13baec1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 17 deletions.
17 changes: 5 additions & 12 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,11 @@
rvm:
- 1.9.3
- 2.2
- 2.1
- 2.0.0
- rbx-2.2.10
- jruby-19mode
- ruby-head
- jruby-head
- 2.2.4

matrix:
allow_failures:
- rvm: ruby-head
- rvm: jruby-head
before_install:
- "export DISPLAY=:99.0"
- "sh -e /etc/init.d/xvfb start"

before_script:
- "cp config/database.travis.yml config/database.yml"
- "RAILS_ENV=test bundle exec rake db:create"

6 changes: 1 addition & 5 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,11 @@ GrapeOnRails::Application.load_tasks

if Rails.env.test? || Rails.env.development?
require 'rspec/core/rake_task'
RSpec::Core::RakeTask.new(:test) do |spec|
# do not run integration tests, doesn't work on TravisCI
spec.pattern = FileList['spec/api/*_spec.rb', 'spec/controllers/*_spec.rb', 'spec/helpers/*_spec.rb', 'spec/views/*_spec.rb']
end

Rake::Task[:default].prerequisites.clear

require 'rubocop/rake_task'
RuboCop::RakeTask.new(:rubocop)

task default: [:rubocop, :test]
task default: [:rubocop, :spec]
end

0 comments on commit 13baec1

Please sign in to comment.