From ad009a71dcc65cc47f95abba042a176c3c8dd278 Mon Sep 17 00:00:00 2001
From: Sarah Mei <sarahmei@gmail.com>
Date: Sun, 4 Sep 2011 11:27:30 -0700
Subject: [PATCH] Don't run oauth.feature on travis, but run all features
 locally.

---
 features/oauth.feature  | 2 +-
 lib/tasks/cucumber.rake | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/features/oauth.feature b/features/oauth.feature
index a50af1ac0..754dc0ab6 100644
--- a/features/oauth.feature
+++ b/features/oauth.feature
@@ -1,4 +1,4 @@
-@javascript
+@javascript @no-ci
 Feature: oauth
   Exchanging oauth credentials
 
diff --git a/lib/tasks/cucumber.rake b/lib/tasks/cucumber.rake
index 0fffe7b16..ef45021ad 100644
--- a/lib/tasks/cucumber.rake
+++ b/lib/tasks/cucumber.rake
@@ -20,7 +20,7 @@ begin
       t.profile = 'default'
       cucumber_opts = "--exclude features/uri-tests/*"
       cucumber_opts << " -f pretty" unless ENV["CI"] || ENV["TRAVIS"]
-      cucumber_opts << " --tags ~@no-ci"
+      cucumber_opts << " --tags ~@no-ci" if ENV["CI"] || ENV["TRAVIS"]
       t.cucumber_opts =  cucumber_opts
     end