fix failing cucumber tests (issue #106)

app/models/user.rb

@@ -65,14 +65,14 @@ def email_required?
   def recipient_label
     if nickname.present?
       nickname
-    elsif identifier.present?
-      identifier
     elsif email.present?
       if new_record?
         "#{email} (new user)"
       else
         email
       end
+    elsif identifier.present?
+      identifier
     else
       "Unknown user"
     end

features/distribution.feature

@@ -235,7 +235,7 @@ Feature: Fundraisers can distribute funds
     And the project balance should be "490.00"
 
   @javascript
-  Scenario: Send to an known email address who has no confirmation token
+  Scenario: Send to a known email address who has no confirmation token
     Given an user with email "[email protected]" and without password nor confirmation token
     And a project managed by "alice"
     And our fee is "0"

features/step_definitions/distribution.rb

@@ -25,6 +25,8 @@
     find("input:enabled").set(arg1)
     click_on "Add"
   end
+
+  wait_for_ajax
 end
 
 Given(/^I add the email address "(.*?)" to the recipients$/) do |arg1|
@@ -41,6 +43,8 @@
     find("input:enabled").set(user.identifier)
     click_on "Add"
   end
+
+  wait_for_ajax
 end
 
 When(/^I select the commit recipients "(.*?)"$/) do |arg1|
@@ -54,6 +58,8 @@
     find("input:enabled").set(arg1)
     click_on "Add"
   end
+
+  wait_for_ajax
 end
 
 Given(/^I fill the amount to "(.*?)" with "(.*?)"$/) do |arg1, arg2|

features/support/ajax.rb

@@ -0,0 +1,2 @@
+
+def wait_for_ajax ; sleep(1) ; end ;