From caa50677210406f0f40b7e3b1101f289ce6d7e50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 24 Aug 2014 22:59:22 +0200 Subject: [PATCH 1/2] don't make loading an assertion, just try waiting for it --- features/step_definitions/user_steps.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/features/step_definitions/user_steps.rb b/features/step_definitions/user_steps.rb index 971e6b09c..d410163ee 100644 --- a/features/step_definitions/user_steps.rb +++ b/features/step_definitions/user_steps.rb @@ -123,7 +123,7 @@ When /^I (?:add|remove) the person (?:to|from) my "([^\"]*)" aspect$/ do |aspect aspects_dropdown.click aspect = find(".dropdown.active .dropdown_list li", text: aspect_name) aspect.click - aspect.parent.should have_css(".loading") + aspect.parent.has_css?(".loading") aspect.parent.should_not have_css(".loading") aspects_dropdown.click end From b9ec56f44bb15e72d942fd861ed9ebaccadb7461 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sun, 24 Aug 2014 23:00:30 +0200 Subject: [PATCH 2/2] bump firefox on travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 852b2cab3..05eaf0491 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,7 +19,7 @@ bundler_args: "--without development production heroku" script: "./script/ci/build.sh" addons: - firefox: "26.0" + firefox: "31.0" notifications: irc: