Travis & Coveralls tweaks

.travis.yml

@@ -3,7 +3,7 @@ rvm:
   - 2.2.2
 before_install: gem install bundler -v 1.10.6
 script:
-  - 'bundle exec rspec'
-  - 'bundle exec cucumber'
+  - 'bundle exec rake spec'
+  - 'bundle exec rake features'
   - 'bundle exec rake coveralls:push'
-  - 'bundle exec rubocop'
+  - 'bundle exec rake rubocop'

Rakefile

@@ -6,11 +6,11 @@ require 'cucumber/rake/task'
 require "rspec/core/rake_task"
 require 'rubocop/rake_task'
 
-Coveralls::RakeTask.new
 Cucumber::Rake::Task.new(:features) do |t|
   t.cucumber_opts = "features --format pretty"
 end
 RSpec::Core::RakeTask.new(:spec)
+Coveralls::RakeTask.new
 RuboCop::RakeTask.new
 
 task :default => :spec

features/support/env.rb

@@ -1,2 +1,3 @@
 require 'coveralls'
 Coveralls.wear_merged!
+SimpleCov.merge_timeout 3600

spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'coveralls'
 Coveralls.wear_merged!
+SimpleCov.merge_timeout 3600
 
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
 require 'budik'