Merge pull request #5152 from jhass/stabilize_cukes

Try stabilizing cukes

.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:

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