Merge branch 'release/0.4.1.0' into develop

2014-08-30 22:15:56 +02:00 · 2014-08-30 22:15:56 +02:00 · 99de61fdfa
commit 99de61fdfa
parent 1515848120 6df79f6983
1 changed files with 1 additions and 1 deletions
--- a/spec/controllers/conversations_controller_spec.rb
+++ b/spec/controllers/conversations_controller_spec.rb
@ -46,7 +46,7 @@ describe ConversationsController, :type => :controller do
      contact.person.profile.update_attribute(:first_name, xss)
      get :new
      json = JSON.parse(assigns(:contacts_json)).first
-      expect(json['value']).to eq(contact.id.to_s)
+      expect(json['value'].to_s).to eq(contact.id.to_s)
      expect(json['name']).to_not include(xss)
    end
  end