From 8b8071925d574d110835ecbe73b15e872f03f1d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Fri, 24 Jan 2014 15:56:09 +0100
Subject: [PATCH] Make toggle aspect call synchronous and bump capybaras wait
timeout
in features/desktop/aspect_navigation.feature:18 we quickly leave the page
before waiting for the request to finish. By making the HTTP call
synchronous we wait for it to finish before we reflect the change in the DOM,
thus giving Capybara a chance to wait for it. Also let Capybara wait longer.
This should random failures of the aforementioned cuke rarer.
---
app/assets/javascripts/app/models/aspect.js | 2 +-
features/support/env.rb | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/assets/javascripts/app/models/aspect.js b/app/assets/javascripts/app/models/aspect.js
index 8ae6dac71d..ec53e034a5 100644
--- a/app/assets/javascripts/app/models/aspect.js
+++ b/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});
}
});
diff --git a/features/support/env.rb b/features/support/env.rb
index c95bb5eab5..dca7bceed3 100644
--- a/features/support/env.rb
+++ b/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
--
GitLab