users_spec.rb in bearcat-1.2.5

- old
+ new

@@ -113,9 +113,15 @@
       custom_food_data = @client.store_custom_data("1", body, "food")
       custom_food_data["data"].keys.count.should == 1
       custom_food_data["data"]["food"]["least_favorite"].should == "water mellon"
     end
 
+    it "merges user info" do
+      body = {}
+      stub_put(@client, "/api/v1/users/1/merge_into/2").with(body: body).to_return(json_response('merge_user.json'))
+      user = @client.user_merge(1,2)
+    end
+
   end
 
   context 'DELETE' do
 
     before (:each) do