spec/jobs/ping_job_spec.rb in rhosync-2.1.6 vs spec/jobs/ping_job_spec.rb in rhosync-2.1.7

@@ -5,20 +5,20 @@
   it_should_behave_like "SourceAdapterHelper"
   
   it "should perform apple ping" do
     params = {"user_id" => @u.id, "api_token" => @api_token,
       "sources" => [@s.name], "message" => 'hello world', 
-      "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3'}
+      "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3', "phone_id" => nil}
     Apple.should_receive(:ping).once.with({'device_pin' => @c.device_pin,
       'device_port' => @c.device_port}.merge!(params))
     PingJob.perform(params)
   end
   
   it "should perform blackberry ping" do
     params = {"user_id" => @u.id, "api_token" => @api_token,
       "sources" => [@s.name], "message" => 'hello world', 
-      "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3'}
+      "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3', "phone_id" => nil}
     @c.device_type = 'blackberry'
     Blackberry.should_receive(:ping).once.with({'device_pin' => @c.device_pin,
       'device_port' => @c.device_port}.merge!(params))
     PingJob.perform(params)
   end
@@ -33,28 +33,45 @@
   end
   
   it "should skip ping for empty device_pin" do
     params = {"user_id" => @u.id, "api_token" => @api_token,
       "sources" => [@s.name], "message" => 'hello world', 
-      "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3'}
+      "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3',"phone_id"=>nil}
     @c.device_type = 'blackberry'
     @c.device_pin = nil
     PingJob.should_receive(:log).once.with("Skipping ping for non-registered client_id '#{@c.id}'...")
     lambda { PingJob.perform(params) }.should_not raise_error
   end
 
   it "should drop ping if it's already in user's device pin list" do
     params = {"user_id" => @u.id, "api_token" => @api_token,
       "sources" => [@s.name], "message" => 'hello world', 
-      "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3'}
+      "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3', "phone_id"=>nil}
 
     # another client with the same device pin ...
     @c1 = Client.create(@c_fields,{:source_name => @s_fields[:name]})
     # and yet another one ...
     @c2 = Client.create(@c_fields,{:source_name => @s_fields[:name]})
 
     Apple.should_receive(:ping).with({'device_pin' => @c.device_pin, 'device_port' => @c.device_port}.merge!(params))
     PingJob.should_receive(:log).twice.with(/Dropping ping request for client/)
     lambda { PingJob.perform(params) }.should_not raise_error
   end
+  
+  it "should drop ping if it's already in user's phone id list and device pin is different" do
+    params = {"user_id" => @u.id, "api_token" => @api_token,
+      "sources" => [@s.name], "message" => 'hello world', 
+      "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3'}
+    @c.phone_id = '3'
+    @c_fields.merge!(:phone_id => '3')
+    # another client with the same phone id..
+    @c1 = Client.create(@c_fields,{:source_name => @s_fields[:name]})
+    #  yet another...
+    @c2 = Client.create(@c_fields,{:source_name => @s_fields[:name]})
+
+    Apple.should_receive(:ping).with({'device_pin' => @c.device_pin, 'phone_id' => @c.phone_id, 'device_port' => @c.device_port}.merge!(params))
+    PingJob.should_receive(:log).twice.with(/Dropping ping request for client/)
+    lambda { PingJob.perform(params) }.should_not raise_error
+  end
+  
   
 end
\ No newline at end of file