From 29c908a6011fb3929b466ab4f668fd79c2aca104 Mon Sep 17 00:00:00 2001
From: Benjamin ter Kuile <bterkuile@gmail.com>
Date: Mon, 22 Sep 2014 17:37:13 +0200
Subject: [PATCH] symbolize serializer keys for spec comparison

---
 .../javascripts/user/app/views/application_view.js.coffee       | 2 --
 app/assets/javascripts/user/flat/application.js.coffee.erb      | 2 +-
 spec/models/list_spec.rb                                        | 2 +-
 spec/serializers/join_request_serializer_spec.rb                | 2 +-
 spec/support/matchers/broadcast_to_user_matcher.rb              | 2 +-
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/assets/javascripts/user/app/views/application_view.js.coffee b/app/assets/javascripts/user/app/views/application_view.js.coffee
index 49fc1e73..862bebe3 100644
--- a/app/assets/javascripts/user/app/views/application_view.js.coffee
+++ b/app/assets/javascripts/user/app/views/application_view.js.coffee
@@ -11,5 +11,3 @@ App.ApplicationView = Ember.View.extend
       else
         menu.show().animate left: 0
         toggle.animate left: 222 - 30, -> $(@).addClass('open')
-
-    $(document).foundation()
diff --git a/app/assets/javascripts/user/flat/application.js.coffee.erb b/app/assets/javascripts/user/flat/application.js.coffee.erb
index 2042dc96..8ec4fa62 100644
--- a/app/assets/javascripts/user/flat/application.js.coffee.erb
+++ b/app/assets/javascripts/user/flat/application.js.coffee.erb
@@ -14,7 +14,7 @@
 #  )(jQuery)
 
 @Qstorage = localStorage
-
+ 
 $.extend($translations.en, <%= I18n.t('user', locale: :en).to_json %>);
 $.extend($translations.nl, <%= I18n.t('user', locale: :nl).to_json %>);
 
diff --git a/spec/models/list_spec.rb b/spec/models/list_spec.rb
index 880320f2..9e74cbde 100644
--- a/spec/models/list_spec.rb
+++ b/spec/models/list_spec.rb
@@ -144,7 +144,7 @@ describe List do
 
         expect{
           list.place_order(products: {product.id => 5}, user: user)
-        }.to broadcast_to_supplier(supplier.id).message('orders_placed_count').with(count: 3)
+        }.to broadcast_to_supplier(supplier.id).message('orders_placed_count').with(count: 2)
       end
     end
 
diff --git a/spec/serializers/join_request_serializer_spec.rb b/spec/serializers/join_request_serializer_spec.rb
index e6a9b3e7..6c9f9fd3 100644
--- a/spec/serializers/join_request_serializer_spec.rb
+++ b/spec/serializers/join_request_serializer_spec.rb
@@ -5,7 +5,7 @@ describe JoinRequestSerializer do
     user = create :user
     list = create :list
     join_request = list.join_request_for_user(user)
-    JoinRequestSerializer.new(join_request).as_json.should == {
+    JoinRequestSerializer.new(join_request).as_json.deep_symbolize_keys.should =~ {
       users: [UserUserSerializer.new(user).as_json(root: false)],
       join_request: {
         id: "jr-#{user.id}",
diff --git a/spec/support/matchers/broadcast_to_user_matcher.rb b/spec/support/matchers/broadcast_to_user_matcher.rb
index 17f1142e..7044fdd9 100644
--- a/spec/support/matchers/broadcast_to_user_matcher.rb
+++ b/spec/support/matchers/broadcast_to_user_matcher.rb
@@ -27,7 +27,7 @@ module Matchers
       relevant_broadcasts = test_broadcaster.broadcasts.select{|b| b[:channel] =~ /^\/user\/#{@user_id}/ && b[:data][:event] == @message}
       @failure_message = "User #{@user_id} did not receive any broadcasts" and return false if relevant_broadcasts.empty?
       @failure_debug_content = "was #{relevant_broadcasts.map{|b| b[:data][:data].inspect}.join(" and ")}"
-      relevant_broadcasts.any? { |b| @target_object === b[:data][:data] }
+      relevant_broadcasts.any? { |b| @target_object === b[:data][:data].deep_symbolize_keys }
     end
 
     def message(msg)