From e366a4b8b584539ee21172080867df12a8f35b48 Mon Sep 17 00:00:00 2001
From: Raphael Sofaer <raphael@joindiaspora.com>
Date: Fri, 5 Aug 2011 17:03:21 -0700
Subject: [PATCH] re-enable the embedder feature outside of CI

---
 features/embedder.feature | 48 +++++++++++++++++++--------------------
 lib/tasks/cucumber.rake   |  1 +
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/features/embedder.feature b/features/embedder.feature
index 8a9beb431..c7f9be488 100644
--- a/features/embedder.feature
+++ b/features/embedder.feature
@@ -1,24 +1,24 @@
-# @javascript
-# Feature: embedding
-#     Get sure that embedding stuff actually works
-# 
-#     Background:
-#       Given a user with username "bob"
-#       When I sign in as "bob@bob.bob"
-#       And I am on the home page
-# 
-#     Scenario: Youtube is fully embedded
-#       Given I expand the publisher
-#       When I fill in "status_message_fake_text" with "Look at this awesome video: https://www.youtube.com/watch?v=53tq9g35kwk"
-#         And I press "Share"
-#         And I follow "My Contacts"
-#       Then I should see "Look at this awesome video: Youtube: Leekspin" within ".stream_element"
-#       When I follow "Youtube: Leekspin"
-#       And I wait for the ajax to finish
-#       Then I should see "Watch this video on YouTube" within ".video-container"
-# 
-#       #After ajax aspect switch
-#       When I follow "Besties" 
-#       And I wait for the ajax to finish
-#       And I follow "Youtube: Leekspin"
-#       Then I should see "Watch this video on YouTube" within ".video-container"
+ @javascript @no-ci
+ Feature: embedding
+     Get sure that embedding stuff actually works
+ 
+     Background:
+       Given a user with username "bob"
+       When I sign in as "bob@bob.bob"
+       And I am on the home page
+ 
+     Scenario: Youtube is fully embedded
+       Given I expand the publisher
+       When I fill in "status_message_fake_text" with "Look at this awesome video: https://www.youtube.com/watch?v=53tq9g35kwk"
+         And I press "Share"
+         And I am on the aspects page
+       Then I should see "Look at this awesome video: Youtube: Leekspin" within ".stream_element"
+       When I follow "Youtube: Leekspin"
+       And I wait for the ajax to finish
+       Then I should see "Watch this video on YouTube" within ".video-container"
+ 
+       #After ajax aspect switch
+       When I follow "Besties" 
+       And I wait for the ajax to finish
+       And I follow "Youtube: Leekspin"
+       Then I should see "Watch this video on YouTube" within ".video-container"
diff --git a/lib/tasks/cucumber.rake b/lib/tasks/cucumber.rake
index 772c40022..0fffe7b16 100644
--- a/lib/tasks/cucumber.rake
+++ b/lib/tasks/cucumber.rake
@@ -20,6 +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"
       t.cucumber_opts =  cucumber_opts
     end