summaryrefslogtreecommitdiff
path: root/spec/integration
diff options
context:
space:
mode:
authorMichael Herold <michael.j.herold@gmail.com>2017-02-03 12:09:04 -0600
committerMichael Herold <michael.j.herold@gmail.com>2017-02-03 15:20:21 -0600
commitf50cf8e6bbf986556d41ca71ac4e180c33613ea1 (patch)
tree494fa558c18a98d76c1d78d143ca910d89cae59e /spec/integration
parentc1a42d4fabeb09b79f43588ca3d79e1b44718cdf (diff)
downloadhashie-f50cf8e6bbf986556d41ca71ac4e180c33613ea1.tar.gz
Bring integration tests into main test harness
We have a nice integration spec harness, so let's make sure we use it when we're working on the gem. I'm making the following changes: * Make `bundle exec rake` run integration specs, except on Travis. * Silence a warning in the OmniAuth integration spec that has nothing to do with Hashie. * Make Guard run integration specs when appropriate. Now, when you run all tasks you will run integration specs. Also, if you modify an integration spec, it will run. Lastly, if you modify anything in `lib` the integration specs will run. * Keeps the extra Travis build that only runs integration specs. Travis didn't like the Rake task that included it and there's extra signal by doing it this way anyway.
Diffstat (limited to 'spec/integration')
-rw-r--r--spec/integration/omniauth/integration_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/integration/omniauth/integration_spec.rb b/spec/integration/omniauth/integration_spec.rb
index 469dd6e..848a61b 100644
--- a/spec/integration/omniauth/integration_spec.rb
+++ b/spec/integration/omniauth/integration_spec.rb
@@ -6,7 +6,7 @@ require 'sinatra'
require 'omniauth'
class MyApplication < Sinatra::Base
- use Rack::Session::Cookie
+ use Rack::Session::Cookie, secret: 'hashie integration tests'
use OmniAuth::Strategies::Developer
get '/' do