Merge pull request #4739 from MrZYX/stabilize_cukes

Stabilize cukes

app/assets/javascripts/app/models/aspect.js

@@ -1,5 +1,5 @@
 app.models.Aspect = Backbone.Model.extend({
   toggleSelected: function(){
-    this.set({'selected' : !this.get('selected')});
+    this.set({'selected' : !this.get('selected')}, {async: false});
   }
 });

features/desktop/comments.feature

@@ -27,10 +27,7 @@ Feature: commenting
     When I sign in as "bob@bob.bob"
     And I am on "alice@alice.alice"'s page
     Then I should see "Look at this dog"
-    When I focus the comment field
-    And I fill in the following:
-        | text            | is that a poodle?    |
-    And I press "Comment"
+    When I comment "is that a poodle?" on "Look at this dog"
     And I click to delete the first comment
     And I confirm the alert
     Then I should not see "is that a poodle?"

features/step_definitions/custom_web_steps.rb

@@ -120,7 +120,7 @@ end
 When /^I click to delete the first comment$/ do
   within("div.comment", match: :first) do
     find(".controls").hover
-    find(".comment_delete").click
+    find(".comment_delete", visible: false).click # TODO: hax to check what's failing on Travis
   end
 end
 

features/support/env.rb

@@ -23,7 +23,7 @@ prefork = proc do
   # Capybara.default_wait_time = 30
 
   # While there are a lot of failures, wait less, avoiding travis timeout
-  Capybara.default_wait_time = 10
+  Capybara.default_wait_time = 15
 
   # If you set this to false, any error raised from within your app will bubble
   # up to your step definition and out to cucumber unless you catch it somewhere
@@ -117,5 +117,5 @@ end
 #   DeferredGarbageCollection.start
 # end
 # After do
-#   DeferredGarbageCollection.reconsider 
+#   DeferredGarbageCollection.reconsider
 # end