rhoconnect 3.2.0.beta1 → 3.2.0.beta2

data/spec/client_sync_spec.rb

@@ -6,7 +6,7 @@ describe "ClientSync" do
       lambda { ClientSync.new(@s,nil,2) }.should raise_error(ArgumentError,'Unknown client')
     end
 
-    it "should handle receive cud for dymanic adapter" do
+    it "should handle receive cud for dynamic adapter" do
       params = {'create'=>{'1'=>@product1}}
       @c.source_name = 'Product2'
       @cs1 = ClientSync.new(@s2,@c,2)
@@ -48,27 +48,39 @@ describe "ClientSync" do
     it "should handle receive cud" do
       params = {'create'=>{'1'=>@product1},'update'=>{'2'=>@product2},'delete'=>{'3'=>@product3}}
       @cs.receive_cud(params)
-      verify_result(@cs.client.docname(:create) => {},
-        @cs.client.docname(:update) => {},
-        @cs.client.docname(:delete) => {})
+      verify_zresult(@s.docname(:create) => [],
+        @s.docname(:update) => [],
+        @s.docname(:delete) => [])
+    end
+    
+    it "should handle receive cud that triggers processing of the previously queued data" do
+      queued_create_data = {'1'=>@product1}
+      set_zstate({@s.docname(:create) => queued_create_data}, @c.id)
+      verify_zresult(@s.docname(:create) => [queued_create_data],
+        @cs.client.docname(:update) => [],
+        @cs.client.docname(:delete) => [])
+      @cs.receive_cud({:source_name => @s_fields[:name]})
+      verify_zresult(@s.docname(:create) => [],
+        @s.docname(:update) => [],
+        @s.docname(:delete) => [])
     end
     
     it "should handle receive cud with pass through" do
       params = {'create'=>{'1'=>@product1},'update'=>{'2'=>@product2},'delete'=>{'3'=>@product3}}
       @s.pass_through = 'true'
       @cs.receive_cud(params)
-      verify_result(@cs.client.docname(:create) => {},
-        @cs.client.docname(:update) => {},
-        @cs.client.docname(:delete) => {})
+      verify_zresult(@s.docname(:create) => [],
+        @s.docname(:update) => [],
+        @s.docname(:delete) => [])
     end
     
     it "should handle exeptions in receive cud with pass through" do
       params = {'create'=>{'1'=>@error},'update'=>{'2'=>@product2},'delete'=>{'3'=>@product3}}
       @s.pass_through = 'true'
       @cs.receive_cud(params)
-      verify_result(@cs.client.docname(:create) => {},
-        @cs.client.docname(:update) => {},
-        @cs.client.docname(:delete) => {})
+      verify_zresult(@s.docname(:create) => [],
+        @s.docname(:update) => [],
+        @s.docname(:delete) => [])
     end
 
     it "should handle send cud" do
@@ -225,9 +237,10 @@ describe "ClientSync" do
         params = {'create'=>{'1'=>@product1},
           'update'=>{'2'=>@product2},'delete'=>{'3'=>@product3}}
         @cs.receive_cud(params)
-        verify_result(@cs.client.docname(:create) => {},
-          @cs.client.docname(:update) => {},
-          @cs.client.docname(:delete) => {},
+        verify_zresult(@s.docname(:create) => [],
+          @s.docname(:update) => [],
+          @s.docname(:delete) => [])
+        verify_result(
           @s.docname(:md) => {},
           @c.docname(:cd) => {})
       end
@@ -698,8 +711,7 @@ describe "ClientSync" do
       it "should return bulk data url for completed bulk data user partition" do
         set_state('test_db_storage' => @data)
         ClientSync.bulk_data(:user,@c)
-        BulkDataJob.perform("data_name" => bulk_data_docname(@a.id,@u.id))
-        BulkDataJob.after_perform_x("data_name" => bulk_data_docname(@a.id,@u.id))
+        do_bulk_data_job("data_name" => bulk_data_docname(@a.id,@u.id))
         ClientSync.bulk_data(:user,@c).should == {:result => :url,
           :url => BulkData.load(bulk_data_docname(@a.id,@u.id)).url}
         verify_result(
@@ -710,8 +722,7 @@ describe "ClientSync" do
 
       it "should return empty bulk data url if there are errors in query" do
         ClientSync.bulk_data(:user,@c)
-        BulkDataJob.perform("data_name" => bulk_data_docname(@a.id,@u.id))
-        BulkDataJob.after_perform_x("data_name" => bulk_data_docname(@a.id,@u.id))
+        do_bulk_data_job("data_name" => bulk_data_docname(@a.id,@u.id))
         errordoc = @s.docname(:errors) # source SampleAdapter
         operation = 'query'
         Store.lock(errordoc) do
@@ -727,8 +738,7 @@ describe "ClientSync" do
           :app_id => @a.id,
           :user_id => name,
           :sources => [@s_fields[:name]])
-        BulkDataJob.perform("data_name" => bulk_data_docname(@a.id,name))
-        BulkDataJob.after_perform_x("data_name" => bulk_data_docname(@a.id,name))
+        do_bulk_data_job("data_name" => bulk_data_docname(@a.id,name))
         data = BulkData.load(bulk_data_docname(@a.id,name))
         data.url.should match /a%20b/
         data.delete
@@ -738,8 +748,7 @@ describe "ClientSync" do
         set_state('test_db_storage' => @data)
         @s.partition = :app
         ClientSync.bulk_data(:app,@c)
-        BulkDataJob.perform("data_name" => bulk_data_docname(@a.id,"*"))
-        BulkDataJob.after_perform_x("data_name" => bulk_data_docname(@a.id,"*"))
+        do_bulk_data_job("data_name" => bulk_data_docname(@a.id,"*"))
         ClientSync.bulk_data(:app,@c).should == {:result => :url,
           :url => BulkData.load(bulk_data_docname(@a.id,"*")).url}
         verify_result(
@@ -752,8 +761,7 @@ describe "ClientSync" do
         set_state('test_db_storage' => @data)
         @s.sync_type = :bulk_sync_only
         ClientSync.bulk_data(:user,@c)
-        BulkDataJob.perform("data_name" => bulk_data_docname(@a.id,@u.id))
-        BulkDataJob.after_perform_x("data_name" => bulk_data_docname(@a.id,@u.id))
+        do_bulk_data_job("data_name" => bulk_data_docname(@a.id,@u.id))
         ClientSync.bulk_data(:user,@c).should == {:result => :url,
           :url => BulkData.load(bulk_data_docname(@a.id,@u.id)).url}
         verify_result(
@@ -766,8 +774,7 @@ describe "ClientSync" do
         set_state('test_db_storage' => @data)
         Rhoconnect.blackberry_bulk_sync = true
         ClientSync.bulk_data(:user,@c)
-        BulkDataJob.perform("data_name" => bulk_data_docname(@a.id,@u.id))
-        BulkDataJob.after_perform_x("data_name" => bulk_data_docname(@a.id,@u.id))
+        do_bulk_data_job("data_name" => bulk_data_docname(@a.id,@u.id))
         data = BulkData.load(bulk_data_docname(@a.id,@u.id))
         ClientSync.bulk_data(:user,@c).should == {:result => :url, :url => data.url}
         File.delete(data.dbfile)

data/spec/javascripts/admins_routes_spec.js

@@ -2,116 +2,121 @@ describe("Admins routes", function() {
   beforeEach(function() {
     this.router = new App.Controllers.Admins();
     this.routeSpy = sinon.spy();
+	sinon.stub(jQuery,'ajax')
     try {
       Backbone.History.start({silent:true, pushState:true});
     } catch(e) {}
     this.router.navigate("test");
   });
+
+  afterEach(function(){
+	jQuery.ajax.restore();
+  });
   
   it("fires the index route with a blank hash", function() {
-     this.router.bind("route:index", this.routeSpy);
-     this.router.navigate("", true);
-     expect(this.routeSpy).toHaveBeenCalledOnce();
-     expect(this.routeSpy).toHaveBeenCalledWith();
-   });
+       this.router.bind("route:index", this.routeSpy);
+       this.router.navigate("", true);
+       expect(this.routeSpy).toHaveBeenCalledOnce();
+       expect(this.routeSpy).toHaveBeenCalledWith();
+     });
+    
+    it("fires the home route with a blank hash", function() {
+          this.router.bind("route:index", this.routeSpy);
+          this.router.navigate("home", true);
+          expect(this.routeSpy).toHaveBeenCalledOnce();
+          expect(this.routeSpy).toHaveBeenCalledWith();
+     });
+   
+   it("fires the show_source route", function() {
+    	this.router.bind('route:show_source', this.routeSpy);
+    	this.router.navigate("sources/1/tuser/tdoc/tclient", true);
+    	expect(this.routeSpy).toHaveBeenCalledOnce();
+    	expect(this.routeSpy).toHaveBeenCalledWith("1","tuser","tdoc","tclient");
+    });
   
-  it("fires the home route with a blank hash", function() {
-     this.router.bind("route:index", this.routeSpy);
-     this.router.navigate("home", true);
-     expect(this.routeSpy).toHaveBeenCalledOnce();
-     expect(this.routeSpy).toHaveBeenCalledWith();
-   });
-
-  it("fires the show_source route", function() {
-   	this.router.bind('route:show_source', this.routeSpy);
-   	this.router.navigate("sources/1", true);
-   	expect(this.routeSpy).toHaveBeenCalledOnce();
-   	expect(this.routeSpy).toHaveBeenCalledWith("1");
-   });
-
-  it("fires the login route", function() {
-   	this.router.bind('route:login', this.routeSpy);
-   	this.router.navigate("login", true);
-   	expect(this.routeSpy).toHaveBeenCalledOnce();
-   	expect(this.routeSpy).toHaveBeenCalledWith();
-  });
-
-  it("fires the logout route", function() {
-   	this.router.bind('route:logout', this.routeSpy);
-   	this.router.navigate("logout", true);
-   	expect(this.routeSpy).toHaveBeenCalledOnce();
-   	expect(this.routeSpy).toHaveBeenCalledWith();
-  });
-
-  it("fires the get_doc route", function() {
-   	this.router.bind('route:get_doc', this.routeSpy);
-   	this.router.navigate("doc/testdoc/2", true);
-   	expect(this.routeSpy).toHaveBeenCalledOnce();
-   	expect(this.routeSpy).toHaveBeenCalledWith("testdoc","2");
-  });
-
-  it("fires the server_doc route", function() {
-   	this.router.bind('route:server_doc', this.routeSpy);
-   	this.router.navigate("docselect", true);
-   	expect(this.routeSpy).toHaveBeenCalledOnce();
-   	expect(this.routeSpy).toHaveBeenCalledWith();
-  });
-
-  it("fires the adapter route", function() {
-   	this.router.bind('route:adapter', this.routeSpy);
-   	this.router.navigate("adapter", true);
-   	expect(this.routeSpy).toHaveBeenCalledOnce();
-   	expect(this.routeSpy).toHaveBeenCalledWith();
-  });
-
-  it("fires the users route", function() {
-   	this.router.bind('route:users', this.routeSpy);
-   	this.router.navigate("users", true);
-   	expect(this.routeSpy).toHaveBeenCalledOnce();
-   	expect(this.routeSpy).toHaveBeenCalledWith();
-  });
-
-  it("fires the new_user route", function() {
-   	this.router.bind('route:new_user', this.routeSpy);
-   	this.router.navigate("users/new", true);
-   	expect(this.routeSpy).toHaveBeenCalledOnce();
-   	expect(this.routeSpy).toHaveBeenCalledWith();
-  });
-
-  it("fires the show_user route", function() {
-   	this.router.bind('route:show_user', this.routeSpy);
-   	this.router.navigate("user/1", true);
-   	expect(this.routeSpy).toHaveBeenCalledOnce();
-   	expect(this.routeSpy).toHaveBeenCalledWith("1");
-  });
-
-  it("fires the new_ping route", function() {
-   	this.router.bind('route:new_ping', this.routeSpy);
-   	this.router.navigate("user/newping/1", true);
-   	expect(this.routeSpy).toHaveBeenCalledOnce();
-   	expect(this.routeSpy).toHaveBeenCalledWith("1");
-  });
-
-  it("fires the new_ping_all route", function() {
-   	this.router.bind('route:new_ping_all', this.routeSpy);
-   	this.router.navigate("users/newping", true);
-   	expect(this.routeSpy).toHaveBeenCalledOnce();
-   	expect(this.routeSpy).toHaveBeenCalledWith();
-  });
-
-  it("fires the user_device route", function() {
-   	this.router.bind('route:user_device', this.routeSpy);
-   	this.router.navigate("device/1/2", true);
-   	expect(this.routeSpy).toHaveBeenCalledOnce();
-   	expect(this.routeSpy).toHaveBeenCalledWith("1","2");
-  });
-
-  it("fires the change_admin route", function() {
-   	this.router.bind('route:change_admin', this.routeSpy);
-   	this.router.navigate("change_admin", true);
-   	expect(this.routeSpy).toHaveBeenCalledOnce();
-   	expect(this.routeSpy).toHaveBeenCalledWith();
-  });
-
+    it("fires the login route", function() {
+     	this.router.bind('route:login', this.routeSpy);
+     	this.router.navigate("login", true);
+     	expect(this.routeSpy).toHaveBeenCalledOnce();
+     	expect(this.routeSpy).toHaveBeenCalledWith();
+    });
+   
+    it("fires the logout route", function() {
+     	this.router.bind('route:logout', this.routeSpy);
+     	this.router.navigate("logout", true);
+     	expect(this.routeSpy).toHaveBeenCalledOnce();
+     	expect(this.routeSpy).toHaveBeenCalledWith();
+    });
+   
+    it("fires the get_doc route", function() {
+     	this.router.bind('route:get_doc', this.routeSpy);
+     	this.router.navigate("doc/testdoc/2", true);
+     	expect(this.routeSpy).toHaveBeenCalledOnce();
+     	expect(this.routeSpy).toHaveBeenCalledWith("testdoc","2");
+    });
+   
+    it("fires the server_doc route", function() {
+     	this.router.bind('route:server_doc', this.routeSpy);
+     	this.router.navigate("docselect", true);
+     	expect(this.routeSpy).toHaveBeenCalledOnce();
+     	expect(this.routeSpy).toHaveBeenCalledWith();
+    });
+   
+    it("fires the adapter route", function() {
+     	this.router.bind('route:adapter', this.routeSpy);
+     	this.router.navigate("adapter", true);
+     	expect(this.routeSpy).toHaveBeenCalledOnce();
+     	expect(this.routeSpy).toHaveBeenCalledWith();
+    });
+   
+    it("fires the users route", function() {
+     	this.router.bind('route:users', this.routeSpy);
+     	this.router.navigate("users", true);
+     	expect(this.routeSpy).toHaveBeenCalledOnce();
+     	expect(this.routeSpy).toHaveBeenCalledWith();
+    });
+   
+    it("fires the new_user route", function() {
+     	this.router.bind('route:new_user', this.routeSpy);
+     	this.router.navigate("users/new", true);
+     	expect(this.routeSpy).toHaveBeenCalledOnce();
+     	expect(this.routeSpy).toHaveBeenCalledWith();
+    });
+   
+    it("fires the show_user route", function() {
+     	this.router.bind('route:show_user', this.routeSpy);
+     	this.router.navigate("user/1", true);
+     	expect(this.routeSpy).toHaveBeenCalledOnce();
+     	expect(this.routeSpy).toHaveBeenCalledWith("1");
+    });
+   
+    it("fires the new_ping route", function() {
+     	this.router.bind('route:new_ping', this.routeSpy);
+     	this.router.navigate("user/newping/1", true);
+     	expect(this.routeSpy).toHaveBeenCalledOnce();
+     	expect(this.routeSpy).toHaveBeenCalledWith("1");
+    });
+   
+    it("fires the new_ping_all route", function() {
+     	this.router.bind('route:new_ping_all', this.routeSpy);
+     	this.router.navigate("users/newping", true);
+     	expect(this.routeSpy).toHaveBeenCalledOnce();
+     	expect(this.routeSpy).toHaveBeenCalledWith();
+    });
+   
+    it("fires the user_device route", function() {
+     	this.router.bind('route:user_device', this.routeSpy);
+     	this.router.navigate("device/1/2", true);
+     	expect(this.routeSpy).toHaveBeenCalledOnce();
+     	expect(this.routeSpy).toHaveBeenCalledWith("1","2");
+    });
+   
+    it("fires the change_admin route", function() {
+     	this.router.bind('route:change_admin', this.routeSpy);
+     	this.router.navigate("change_admin", true);
+     	expect(this.routeSpy).toHaveBeenCalledOnce();
+     	expect(this.routeSpy).toHaveBeenCalledWith();
+    });
+ 
 });
 

data/spec/javascripts/doc_view_spec.js

@@ -27,11 +27,10 @@ describe("DocView", function(){
 	});
 	
 	it("should have correct html rendered ",function(){
-		var title = this.docView.el.innerHTML.search('[testkey]');
+		var title = this.docView.el.innerHTML.search('testkey');
 		expect(title).toBeGreaterThan(0);
 		
-		var change_btn = this.docView.el.innerHTML.search('Upload Token string');
+		var change_btn = this.docView.el.innerHTML.search('Upload token string');
 		expect(change_btn).toBeGreaterThan(0);
-		
 	})
 });

data/spec/javascripts/edit_user_view_spec.js

@@ -34,7 +34,7 @@ describe("EditUserView", function(){
 	});
 	
 	it("should have correct html rendered ",function(){
-		var title = this.editUserView.el.innerHTML.search('Edit admin');
+		var title = this.editUserView.el.innerHTML.search('Change Admin Password');
 		expect(title).toBeGreaterThan(0);
 		
 		var password = this.editUserView.el.innerHTML.search('Password');

data/spec/javascripts/home_view_spec.js

@@ -8,7 +8,9 @@ describe("Home", function(){
 	
 		sinon.stub(source,'fetch')
 		sinon.stub(source,'save');
-	
+	    confirmStub = sinon.stub(window, 'confirm');
+		confirmStub.returns(true);
+		
 		this.homeView = new App.Views.Home({model : source});
 	});
 	
@@ -16,6 +18,7 @@ describe("Home", function(){
 		var session = new Session();
 		session.setAuthenticated('false');
 		session.setApiKey(null);
+		confirmStub.restore();
 	});
 	
 	it("should have render initial html",function(){
@@ -26,13 +29,10 @@ describe("Home", function(){
 	});
 	
 	it("should have correct html rendered ",function(){
-		var title = this.homeView.el.innerHTML.search('Home');
-		expect(title).toBeGreaterThan(0);
-		
-		var change_btn = this.homeView.el.innerHTML.search('Change Admin Password');
+		var change_btn = this.homeView.el.innerHTML.search('App partition sources');
 		expect(change_btn).toBeGreaterThan(0);
 		
-		var reset = this.homeView.el.innerHTML.search('Reset');
+		var reset = this.homeView.el.innerHTML.search('Sync Server URL');
 		expect(reset).toBeGreaterThan(0);
 		
 	})

data/spec/javascripts/server_doc_view_spec.js

@@ -28,6 +28,10 @@ describe("ServerDocView", function(){
 	it("should clear doc",function(){
 		this.serverDocClearSpy = sinon.spy(this.serverDocView,'clear');
 	    doc.set('dbkey','testdbkey');
+		function myevent(){
+			this.preventDefault=function(){return true;}
+		}
+		e = new myevent();
 		this.serverDocView.clear(e);
 		expect(this.serverDocClearSpy).toHaveBeenCalledOnce();
 	});

data/spec/javascripts/session_spec.js

@@ -0,0 +1,15 @@
+describe("Session", function(){
+	beforeEach(function(){
+		this.session = new Session;	
+	});
+	
+	it("should have set session key",function(){
+		this.session.setApiKey("testkey")
+		expect(this.session.getApiKey()).toEqual('testkey')
+	});
+	
+	it("should have set authentication",function(){
+		this.session.setAuthenticated("true")
+		expect(this.session.getAuthenticated()).toEqual('true')
+	});
+})

data/spec/javascripts/set_adapter_view_spec.js

@@ -5,9 +5,9 @@ describe("SetAdapterView", function(){
 		session.setAuthenticated('true');
 		session.setApiKey('testtoken');
 	    adapter = new Adapter();
-	
+	    
 		sinon.stub(jQuery,'ajax')
-	
+	    var domain = 'http://test.com'
 		this.setAdapterView = new App.Views.SetAdapter({model : adapter});
 	});
 	
@@ -25,8 +25,4 @@ describe("SetAdapterView", function(){
 		expect(this.setAdapterSpy).toHaveBeenCalledOnce();
 	});
 	
-	it("should have correct html rendered ",function(){
-		var title = this.setAdapterView.el.innerHTML.search('Set Backend App URL');
-		expect(title).toBeGreaterThan(0);	
-	})
 });

data/spec/javascripts/show_device_view_spec.js

@@ -9,7 +9,9 @@ describe("ShowDeviceView", function(){
 		client.set('user_id', 'user_id');
 	
 		sinon.stub(jQuery,'ajax')
-	
+		confirmStub = sinon.stub(window, 'confirm');
+		confirmStub.returns(true);
+		
 		this.setdeviceView = new App.Views.ShowDevice({model : client});
 	});
 	
@@ -18,6 +20,7 @@ describe("ShowDeviceView", function(){
 		session.setAuthenticated('false');
 		session.setApiKey(null);
 		jQuery.ajax.restore();
+		confirmStub.restore();
 	});
 	
 	it("should have render initial html",function(){

data/spec/javascripts/show_user_view_spec.js

@@ -11,6 +11,9 @@ describe("ShowUserView", function(){
 		sinon.stub(jQuery,'ajax')
 		sinon.stub(source,'fetch')
 	
+	    confirmStub = sinon.stub(window, 'confirm');
+		confirmStub.returns(true);
+		
 		this.showUserView = new App.Views.ShowUser({model : user});
 	});
 	
@@ -19,6 +22,7 @@ describe("ShowUserView", function(){
 		session.setAuthenticated('false');
 		session.setApiKey(null);
 		jQuery.ajax.restore();
+		confirmStub.restore();
 	});
 	
 	it("should have render initial html",function(){

data/spec/javascripts/source_docs_view_spec.js

@@ -27,10 +27,10 @@ describe("SourceDocsView", function(){
 	});
 		
 	it("should have correct html rendered ",function(){
-		var title = this.sourceDocsView.el.innerHTML.search("Source attributes");
+		var title = this.sourceDocsView.el.innerHTML.search("Attributes");
 		expect(title).toBeGreaterThan(0);
 		
-		var title2 = this.sourceDocsView.el.innerHTML.search("Documents for app partition");
+		var title2 = this.sourceDocsView.el.innerHTML.search("Documents");
 		expect(title2).toBeGreaterThan(0);	
 	})
 });

data/spec/jobs/bulk_data_job_spec.rb

@@ -23,8 +23,7 @@ describe "BulkDataJob" do
         :app_id => @a.id,
         :user_id => @u.id,
         :sources => [@s_fields[:name], 'FixedSchemaAdapter'])
-      BulkDataJob.perform("data_name" => data.name)
-      BulkDataJob.after_perform_x("data_name" => data.name)
+      do_bulk_data_job("data_name" => data.name)
       data = BulkData.load(docname)
       data.completed?.should == true
       verify_result(@s.docname(:md) => @data,@s.docname(:md_copy) => @data)
@@ -51,8 +50,7 @@ describe "BulkDataJob" do
         :app_id => @a.id,
         :user_id => @u.id,
         :sources => [@s_fields[:name]])
-      BulkDataJob.perform("data_name" => data.name)
-      BulkDataJob.after_perform_x("data_name" => data.name)
+      do_bulk_data_job("data_name" => data.name)
       data = BulkData.load(docname)
       data.completed?.should == true
       verify_result(@s.docname(:md) => @data,@s.docname(:md_copy) => @data)
@@ -70,8 +68,7 @@ describe "BulkDataJob" do
           :app_id => @a.id,
           :user_id => @u.id,
           :sources => [@s_fields[:name]])
-        BulkDataJob.perform("data_name" => data.name)
-        BulkDataJob.after_perform_x("data_name" => data.name)
+        do_bulk_data_job("data_name" => data.name)
         data = BulkData.load(docname)
         data.completed?.should == true
         verify_result(@s.docname(:md) => @data,
@@ -90,8 +87,7 @@ describe "BulkDataJob" do
           :app_id => @a.id,
           :user_id => @u.id,
           :sources => [@s_fields[:name]])
-        BulkDataJob.perform("data_name" => data.name)
-        BulkDataJob.after_perform_x("data_name" => data.name)
+        do_bulk_data_job("data_name" => data.name)
         data = BulkData.load(docname)
         data.completed?.should == true        
         verify_result(@s.docname(:md) => @data, @s.docname(:md_copy) => @data)
@@ -112,8 +108,8 @@ describe "BulkDataJob" do
 
     it "should delete bulk data if exception is raised" do
       lambda { 
-        BulkDataJob.perform("data_name" => 'broken')
-        BulkDataJob.after_perform_x("data_name" => data.name) }.should raise_error(Exception)
+        do_bulk_data_job("data_name" => 'broken')
+      }.should raise_error(Exception)
       Store.db.keys('bulk_data*').should == []
     end
 
@@ -124,8 +120,8 @@ describe "BulkDataJob" do
         :user_id => @u.id,
         :sources => [@s_fields[:name]])
       lambda { 
-        BulkDataJob.perform("data_name" => data.name)
-        BulkDataJob.after_perform_x("data_name" => data.name) }.should raise_error(Exception)
+        do_bulk_data_job("data_name" => data.name)
+      }.should raise_error(Exception)
       Store.db.keys('bulk_data*').should == []
     end
   end  

data/spec/jobs/ping_job_spec.rb

@@ -154,5 +154,26 @@ describe "PingJob" do
       PingJob.should_receive(:log).once.with(/Dropping ping request for client/)
       lambda { PingJob.perform(params) }.should_not raise_error
     end
+    
+    it "should process all pings even if some of them are failing" do
+      params = {"user_id" => [ @u.id, @u1.id], "api_token" => @api_token,
+        "sources" => [@s.name], "message" => 'hello world', 
+        "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3', 'phone_id' => nil }
+      @c.phone_id = '3'
+      
+      scrubbed_params = params.dup
+      scrubbed_params['vibrate'] = '5'
+      @c1.device_type = 'blackberry'
+      
+      Apple.should_receive(:ping).with(params.merge!({'device_pin' => @c.device_pin, 'phone_id' => @c.phone_id, 'device_port' => @c.device_port})).and_return { raise SocketError.new("Socket failure") }
+      Blackberry.should_receive(:ping).with({'device_pin' => @c1.device_pin, 'device_port' => @c1.device_port}.merge!(scrubbed_params))
+      exception_raised = false
+      begin
+        PingJob.perform(params)
+      rescue Exception => e
+        exception_raised = true
+      end
+      exception_raised.should == true
+    end
   end  
 end

data/spec/perf/bulk_data_perf_spec.rb

@@ -24,8 +24,7 @@ describe "BulkData Performance" do
         :app_id => @a.id,
         :user_id => @u.id,
         :sources => [@s_fields[:name]])
-      BulkDataJob.perform("data_name" => data.name)
-      BulkDataJob.after_perform_x("data_name" => data.name)
+      do_bulk_data_job("data_name" => data.name)
       lap_timer('BulkDataJob.perform duration',start)
     end
   end  

data/spec/server/server_spec.rb

@@ -426,8 +426,7 @@ describe "Server" do
       it "should receive url when bulk data is available" do
         set_state('test_db_storage' => @data)
         get "/api/application/bulk_data", :partition => :user, :client_id => @c.id
-        BulkDataJob.perform("data_name" => bulk_data_docname(@a.id,@u.id))
-        BulkDataJob.after_perform_x("data_name" => bulk_data_docname(@a.id,@u.id))
+        do_bulk_data_job("data_name" => bulk_data_docname(@a.id,@u.id))
         get "/api/application/bulk_data", :partition => :user, :client_id => @c.id
         last_response.should be_ok
         data = BulkData.load(bulk_data_docname(@a.id,@u.id))
@@ -439,8 +438,7 @@ describe "Server" do
       it "should download bulk data file" do
         set_state('test_db_storage' => @data)
         get "/api/application/bulk_data", :partition => :user, :client_id => @c.id
-        BulkDataJob.perform("data_name" => bulk_data_docname(@a.id,@u.id))
-        BulkDataJob.after_perform_x("data_name" => bulk_data_docname(@a.id,@u.id))
+        do_bulk_data_job("data_name" => bulk_data_docname(@a.id,@u.id))
         get "/api/application/bulk_data", :partition => :user, :client_id => @c.id
         get JSON.parse(last_response.body)["url"]
         last_response.should be_ok