rhoconnect 4.0.4 → 5.1.1

data/spec/ping/apple_spec.rb

@@ -1,76 +1,76 @@
 require File.join(File.dirname(__FILE__),'..','spec_helper')
 
 describe "Ping Apple" do
-  it_behaves_like "SharedRhoconnectHelper", :rhoconnect_data => false do
-    before do
-      @params = {"user_id" => @u.id, "api_token" => @api_token,
-        "sources" => [@s.name], "message" => 'hello world', 
-        "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3',
-        "device_pin" => @c.device_pin, "device_port" => @c.device_port}
-      ssl_ctx = mock("ssl_ctx")
-      ssl_ctx.stub!(:key=).and_return('key')
-      ssl_ctx.stub!(:cert=).and_return('cert')
-      OpenSSL::SSL::SSLContext.stub!(:new).and_return(ssl_ctx)
-      OpenSSL::PKey::RSA.stub!(:new)
-      OpenSSL::X509::Certificate.stub!(:new)
+  include_examples "SharedRhoconnectHelper", :rhoconnect_data => false
 
-      tcp_socket = mock("tcp_socket")
-      tcp_socket.stub!(:close)
-      TCPSocket.stub!(:new).and_return(tcp_socket)
+  before do
+    @params = {"user_id" => @u.id, "api_token" => @api_token,
+      "sources" => [@s.name], "message" => 'hello world',
+      "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3',
+      "device_pin" => @c.device_pin, "device_port" => @c.device_port}
+    ssl_ctx = double("ssl_ctx")
+    ssl_ctx.stub(:key=).and_return('key')
+    ssl_ctx.stub(:cert=).and_return('cert')
+    OpenSSL::SSL::SSLContext.stub(:new).and_return(ssl_ctx)
+    OpenSSL::PKey::RSA.stub(:new)
+    OpenSSL::X509::Certificate.stub(:new)
 
-      @ssl_socket = mock("ssl_socket")
-      @ssl_socket.stub!(:sync=)
-      @ssl_socket.stub!(:connect)
-      @ssl_socket.stub!(:write)
-      @ssl_socket.stub!(:close)
-      OpenSSL::SSL::SSLSocket.stub!(:new).and_return(@ssl_socket)
-    end
+    tcp_socket = double("tcp_socket")
+    tcp_socket.stub(:close)
+    TCPSocket.stub(:new).and_return(tcp_socket)
 
-    # TODO: This should really test SSLSocket.write
-    it "should ping apple" do
-      Apple.ping(@params)
-    end
+    @ssl_socket = double("ssl_socket")
+    @ssl_socket.stub(:sync=)
+    @ssl_socket.stub(:connect)
+    @ssl_socket.stub(:write)
+    @ssl_socket.stub(:close)
+    OpenSSL::SSL::SSLSocket.stub(:new).and_return(@ssl_socket)
+  end
 
-    it "should log deprecation on iphone ping" do
-      Iphone.should_receive(
-        :log
-      ).once.with("DEPRECATION WARNING: 'iphone' is a deprecated device_type, use 'apple' instead")
-      Iphone.ping(@params)
-    end
+  # TODO: This should really test SSLSocket.write
+  it "should ping apple" do
+    Apple.ping(@params)
+  end
 
-    it "should compute apn_message" do
-      expected_hash = {
-        "aps"=>{"vibrate"=>"5", "badge"=>5, "alert"=>"hello world", "sound"=>"hello.mp3"}, 
-        "do_sync"=>["SampleAdapter"] 
-      }
-      apn_message = Apple.apn_message(@params)
-      apn_message.start_with?("\000\000 \253\315\000g").should be_true 
-      JSON.parse(apn_message.sub("\000\000 \253\315\000g","")).should ==  expected_hash
-    end
+  it "should log deprecation on iphone ping" do
+    Iphone.should_receive(
+      :log
+    ).once.with("DEPRECATION WARNING: 'iphone' is a deprecated device_type, use 'apple' instead")
+    Iphone.ping(@params)
+  end
 
-    it "should compute apn_message with source array" do
-      @params['sources'] << 'SimpleAdapter'
-      expected_hash = {
-        "aps"=>{"vibrate"=>"5", "badge"=>5, "alert"=>"hello world", "sound"=>"hello.mp3"}, 
-        "do_sync"=>["SampleAdapter", "SimpleAdapter"] 
-      }
-      apn_message = Apple.apn_message(@params)
-      apn_message.start_with?("\000\000 \253\315\000w").should be_true 
-      JSON.parse(apn_message.sub("\000\000 \253\315\000w","")).should ==  expected_hash
-    end
+  it "should compute apn_message" do
+    expected_hash = {
+      "aps"=>{"vibrate"=>"5", "badge"=>5, "alert"=>"hello world", "sound"=>"hello.mp3"},
+      "do_sync"=>["SampleAdapter"]
+    }
+    apn_message = Apple.apn_message(@params)
+    apn_message[0, 7].inspect.gsub("\"", "").should == "\\x00\\x00 \\xAB\\xCD\\x00g"
+    JSON.parse(apn_message[7, apn_message.length]).should ==  expected_hash
+  end
 
-    it "should raise SocketError if socket fails" do
-      error = 'socket error'
-      @ssl_socket.stub!(:write).and_return { raise SocketError.new(error) }
-      Apple.should_receive(:log).once.with("Error while sending ping: #{error}")
-      lambda { Apple.ping(@params) }.should raise_error(SocketError,error)
-    end
-    
-    it "should do nothing if no cert or host or port" do
-       Rhoconnect::Apple.stub!(:get_config).and_return({:test => {:iphonecertfile=>"none"}})
-       Rhoconnect::Apple.should_receive(:get_config).once
-       OpenSSL::SSL::SSLContext.should_receive(:new).exactly(0).times
-       Apple.ping(@params)
-     end
-  end  
+  it "should compute apn_message with source array" do
+    @params['sources'] << 'SimpleAdapter'
+    expected_hash = {
+      "aps"=>{"vibrate"=>"5", "badge"=>5, "alert"=>"hello world", "sound"=>"hello.mp3"},
+      "do_sync"=>["SampleAdapter", "SimpleAdapter"]
+    }
+    apn_message = Apple.apn_message(@params)
+    apn_message[0, 7].inspect.gsub("\"", "").should == "\\x00\\x00 \\xAB\\xCD\\x00w"
+    JSON.parse(apn_message[7, apn_message.length]).should ==  expected_hash
+  end
+
+  it "should raise SocketError if socket fails" do
+    error = 'socket error'
+    @ssl_socket.stub(:write).and_return { raise SocketError.new(error) }
+    Apple.should_receive(:log).once.with("Error while sending ping: #{error}")
+    lambda { Apple.ping(@params) }.should raise_error(SocketError,error)
+  end
+
+  it "should do nothing if no cert or host or port" do
+     Rhoconnect::Apple.stub(:get_config).and_return({:test => {:iphonecertfile=>"none"}})
+     Rhoconnect::Apple.should_receive(:get_config).once
+     OpenSSL::SSL::SSLContext.should_receive(:new).exactly(0).times
+     Apple.ping(@params)
+  end
 end

data/spec/ping/gcm_spec.rb

@@ -1,99 +1,98 @@
 require File.join(File.dirname(__FILE__),'..','spec_helper')
 
 describe "Ping Android GCM" do
-  it_behaves_like "SharedRhoconnectHelper", :rhoconnect_data => false do
+  include_examples "SharedRhoconnectHelper", :rhoconnect_data => false
 
-    before(:each) do
-      @params = {"device_pin" => @c.device_pin,
-        "sources" => [@s.name], "message" => 'hello world',
-        "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3'}
-      @response = mock('response')
-      Rhoconnect.settings[:gcm_api_key] = 'validkey'
-    end
+  before(:each) do
+    @params = {"device_pin" => @c.device_pin,
+      "sources" => [@s.name], "message" => 'hello world',
+      "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3'}
+    @response = double('response')
+    Rhoconnect.settings[:gcm_api_key] = 'validkey'
+  end
 
-    it "should ping gcm successfully" do
-      result = 'id=0:34234234134254%abc123\n'
-      @response.stub!(:code).and_return(200)
-      @response.stub!(:body).and_return(result)
-      @response.stub!(:headers).and_return({})
-      @response.stub!(:return!).and_return(@response)
-      setup_post_yield(@response)
-      Gcm.ping(@params).body.should == result
-    end
+  it "should ping gcm successfully" do
+    result = 'id=0:34234234134254%abc123\n'
+    @response.stub(:code).and_return(200)
+    @response.stub(:body).and_return(result)
+    @response.stub(:headers).and_return({})
+    @response.stub(:return!).and_return(@response)
+    setup_post_yield(@response)
+    Gcm.ping(@params).body.should == result
+  end
 
-    it "should raise error on missing gcm_api_key setting" do
-      key = Rhoconnect.settings[:gcm_api_key].dup
-      Rhoconnect.settings[:gcm_api_key] = nil
-      lambda { Gcm.ping(@params) }.should raise_error(
-        Gcm::InvalidApiKey, 'Missing `:gcm_api_key:` option in settings/settings.yml'
-      )
-      Rhoconnect.settings[:gcm_api_key] = key
-    end
+  it "should raise error on missing gcm_api_key setting" do
+    key = Rhoconnect.settings[:gcm_api_key].dup
+    Rhoconnect.settings[:gcm_api_key] = nil
+    lambda { Gcm.ping(@params) }.should raise_error(
+      Gcm::InvalidApiKey, 'Missing `:gcm_api_key:` option in settings/settings.yml'
+    )
+    Rhoconnect.settings[:gcm_api_key] = key
+  end
 
-    it "should ping gcm with 503 connection error" do
-      error = 'Connection refused'
-      @response.stub!(:body).and_return(error)
-      RestClient.stub!(:post).and_return { raise RestClient::Exception.new(@response,503) }
-      Gcm.should_receive(:log).twice
-      lambda { Gcm.ping(@params) }.should raise_error(RestClient::Exception)
-    end
+  it "should ping gcm with 503 connection error" do
+    error = 'Connection refused'
+    @response.stub(:body).and_return(error)
+    RestClient.stub(:post).and_return { raise RestClient::Exception.new(@response,503) }
+    Gcm.should_receive(:log).twice
+    lambda { Gcm.ping(@params) }.should raise_error(RestClient::Exception)
+  end
 
-    it "should ping gcm with 200 error message" do
-      error = 'Error=QuotaExceeded'
-      @response.stub!(:code).and_return(200)
-      @response.stub!(:body).and_return(error)
-      @response.stub!(:headers).and_return(nil)
-      setup_post_yield(@response)
-      Gcm.should_receive(:log).twice
-      lambda { Gcm.ping(@params) }.should raise_error(Gcm::GCMPingError, "GCM ping error: QuotaExceeded")
-    end
+  it "should ping gcm with 200 error message" do
+    error = 'Error=QuotaExceeded'
+    @response.stub(:code).and_return(200)
+    @response.stub(:body).and_return(error)
+    @response.stub(:headers).and_return(nil)
+    setup_post_yield(@response)
+    Gcm.should_receive(:log).twice
+    lambda { Gcm.ping(@params) }.should raise_error(Gcm::GCMPingError, "GCM ping error: QuotaExceeded")
+  end
 
-    it "should fail to ping with bad authentication" do
-      error = 'Error=BadAuthentication'
-      @response.stub!(:code).and_return(403)
-      @response.stub!(:body).and_return(error)
-      @response.stub!(:headers).and_return({})
-      setup_post_yield(@response)
-      Gcm.should_receive(:log).twice
-      lambda { Gcm.ping(@params) }.should raise_error(
-        Gcm::InvalidApiKey, "Invalid GCM api key. Obtain new api key from GCM service."
-      )
-    end
+  it "should fail to ping with bad authentication" do
+    error = 'Error=BadAuthentication'
+    @response.stub(:code).and_return(403)
+    @response.stub(:body).and_return(error)
+    @response.stub(:headers).and_return({})
+    setup_post_yield(@response)
+    Gcm.should_receive(:log).twice
+    lambda { Gcm.ping(@params) }.should raise_error(
+      Gcm::InvalidApiKey, "Invalid GCM api key. Obtain new api key from GCM service."
+    )
+  end
 
-    it "should ping gcm with 401 error message" do
-      @response.stub!(:code).and_return(401)
-      @response.stub!(:body).and_return('')
-      setup_post_yield(@response)
-      Gcm.should_receive(:log).twice
-      lambda { Gcm.ping(@params) }.should raise_error(
-        Gcm::InvalidApiKey, "Invalid GCM api key. Obtain new api key from GCM service."
-      )
-    end
+  it "should ping gcm with 401 error message" do
+    @response.stub(:code).and_return(401)
+    @response.stub(:body).and_return('')
+    setup_post_yield(@response)
+    Gcm.should_receive(:log).twice
+    lambda { Gcm.ping(@params) }.should raise_error(
+      Gcm::InvalidApiKey, "Invalid GCM api key. Obtain new api key from GCM service."
+    )
+  end
 
-    it "should compute gcm_message" do
-      expected = {
-        'registration_ids' => [@c.device_pin],
-        'collapse_key' => "RAND_KEY",
-        'data' => {
-          'do_sync' => @s.name,
-          'alert' => "hello world",
-          'vibrate' => '5',
-          'sound' => "hello.mp3"
-        }
+  it "should compute gcm_message" do
+    expected = {
+      'registration_ids' => [@c.device_pin],
+      'collapse_key' => "RAND_KEY",
+      'data' => {
+        'do_sync' => @s.name,
+        'alert' => "hello world",
+        'vibrate' => '5',
+        'sound' => "hello.mp3"
       }
-      actual = Gcm.gcm_message(@params)
-      actual['collapse_key'] = "RAND_KEY" unless actual['collapse_key'].nil?
-      actual.should == expected
-    end
+    }
+    actual = Gcm.gcm_message(@params)
+    actual['collapse_key'] = "RAND_KEY" unless actual['collapse_key'].nil?
+    actual.should == expected
+  end
 
-    it "should trim empty or nil params from gcm_message" do
-      expected = {'registration_ids' => [@c.device_pin], 'collapse_key' => "RAND_KEY",
-        'data' => {'vibrate' => '5', 'do_sync' => '', 'sound' => "hello.mp3"} }
-      params = {"device_pin" => @c.device_pin,
-        "sources" => [], "message" => '', "vibrate" => '5', "sound" => 'hello.mp3'}
-      actual = Gcm.gcm_message(params)
-      actual['collapse_key'] = "RAND_KEY" unless actual['collapse_key'].nil?
-      actual.should == expected
-    end
+  it "should trim empty or nil params from gcm_message" do
+    expected = {'registration_ids' => [@c.device_pin], 'collapse_key' => "RAND_KEY",
+      'data' => {'vibrate' => '5', 'do_sync' => '', 'sound' => "hello.mp3"} }
+    params = {"device_pin" => @c.device_pin,
+      "sources" => [], "message" => '', "vibrate" => '5', "sound" => 'hello.mp3'}
+    actual = Gcm.gcm_message(params)
+    actual['collapse_key'] = "RAND_KEY" unless actual['collapse_key'].nil?
+    actual.should == expected
   end
 end

data/spec/ping/rhoconnect_push_spec.rb

@@ -1,58 +1,57 @@
 require File.join(File.dirname(__FILE__),'..','spec_helper')
 
 describe "Ping using RhoConnect push" do
-  it_behaves_like "SharedRhoconnectHelper", :rhoconnect_data => false do
-    
-    before do
-      @params = {"device_pin" => @c.device_pin,
-        "sources" => [@s.name], "message" => 'hello world', 
-        "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3'}
-      @response = mock('response')
-
-    end
-
-    it "should ping rhoconnect push successfully" do
-      result = ''
-      @response.stub!(:code).and_return(204)
-      @response.stub!(:body).and_return(result)
-      @response.stub!(:return!).and_return(@response)
-      RestClient.stub!(:post).and_return(@response)
-      res = RhoconnectPush.ping(@params)
-      res.body.should == result
-      res.code.should == 204
-    end
-
-    it "should ping rhoconnect push with missing push_server property" do
-      RhoconnectPush.stub!(:get_config).and_return({:test => {}})
-      lambda { RhoconnectPush.ping(@params) }.should raise_error(
-        RhoconnectPush::InvalidPushServer, "Missing or invalid `:push_server` in settings/settings.yml."
-      )
-    end
-    
-
-    it "should ping rhoconnect push with 400 response" do
-      result = ''
-      @response.stub!(:code).and_return(400)
-      @response.stub!(:body).and_return(result)
-      @response.stub!(:return!).and_return(@response)
-      setup_post_yield(@response)
-      lambda { RhoconnectPush.ping(@params) }.should raise_error(
-        RhoconnectPush::InvalidPushRequest, "Invalid push request."
-      )
-    end
-
-    it "should compute push_message" do
-      expected = {
-        'collapseId' => 5,
-        'data' => { 
-          'do_sync' => [@s.name],
-          'alert' => "hello world",
-          'vibrate' => '5',
-          'sound' => "hello.mp3"
-        }
+  include_examples "SharedRhoconnectHelper", :rhoconnect_data => false
+
+  before do
+    @params = {"device_pin" => @c.device_pin,
+      "sources" => [@s.name], "message" => 'hello world',
+      "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3'}
+    @response = double('response')
+
+  end
+
+  it "should ping rhoconnect push successfully" do
+    result = ''
+    @response.stub(:code).and_return(204)
+    @response.stub(:body).and_return(result)
+    @response.stub(:return!).and_return(@response)
+    RestClient.stub(:post).and_return(@response)
+    res = RhoconnectPush.ping(@params)
+    res.body.should == result
+    res.code.should == 204
+  end
+
+  it "should ping rhoconnect push with missing push_server property" do
+    RhoconnectPush.stub(:get_config).and_return({:test => {}})
+    lambda { RhoconnectPush.ping(@params) }.should raise_error(
+      RhoconnectPush::InvalidPushServer, "Missing or invalid `:push_server` in settings/settings.yml."
+    )
+  end
+
+
+  it "should ping rhoconnect push with 400 response" do
+    result = ''
+    @response.stub(:code).and_return(400)
+    @response.stub(:body).and_return(result)
+    @response.stub(:return!).and_return(@response)
+    setup_post_yield(@response)
+    lambda { RhoconnectPush.ping(@params) }.should raise_error(
+      RhoconnectPush::InvalidPushRequest, "Invalid push request."
+    )
+  end
+
+  it "should compute push_message" do
+    expected = {
+      'collapseId' => 5,
+      'data' => {
+        'do_sync' => [@s.name],
+        'alert' => "hello world",
+        'vibrate' => '5',
+        'sound' => "hello.mp3"
       }
-      actual = RhoconnectPush.push_message(@params)
-      JSON.parse(actual).should == expected
-    end
-  end  
+    }
+    actual = RhoconnectPush.push_message(@params)
+    JSON.parse(actual).should == expected
+  end
 end