rhoconnect 4.0.4 → 5.1.1

data/spec/api/app/push_objects_spec.rb

@@ -1,45 +1,45 @@
 require File.join(File.dirname(__FILE__),'..','api_helper')
 
 describe "RhoconnectApiPushObjects" do
-  it_should_behave_like "ApiHelper" do
-    it "should push new objects to rhoconnect's :md" do
-      data = {'1' => @product1, '2' => @product2, '3' => @product3}
-      post "/app/#{Rhoconnect::API_VERSION}/#{@s_fields[:name]}/push_objects",
-        {:user_id => @u.id, :objects => data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      verify_doc_result(@s, {:md => data, :md_size=>'3'})
-    end
-    
-    it "should push new objects to rhoconnect's :md with old api/source route and deprecation warning" do
-      data = {'1' => @product1, '2' => @product2, '3' => @product3}
-      post "/api/source/push_objects",
-        {:user_id => @u.id, :source_id => @s_fields[:name], :objects => data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      last_response.headers["Warning"].index('deprecated').should_not == nil
-      verify_doc_result(@s, {:md => data, :md_size=>'3'})
-    end
-    
-    it "should push new objects to rhoconnect's :md with oldest api route and deprecation warning" do
-      data = {'1' => @product1, '2' => @product2, '3' => @product3}
-      post "/api/push_objects",
-        {:user_id => @u.id, :source_id => @s_fields[:name], :objects => data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      last_response.headers["Warning"].index('deprecated').should_not == nil
-      verify_doc_result(@s, {:md => data, :md_size=>'3'})
-    end
+  include_examples "ApiHelper"
+
+  it "should push new objects to rhoconnect's :md" do
+    data = {'1' => @product1, '2' => @product2, '3' => @product3}
+    post "/app/#{Rhoconnect::API_VERSION}/#{@s_fields[:name]}/push_objects",
+      {:user_id => @u.id, :objects => data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    verify_doc_result(@s, {:md => data, :md_size=>'3'})
+  end
+
+  it "should push new objects to rhoconnect's :md with old api/source route and deprecation warning" do
+    data = {'1' => @product1, '2' => @product2, '3' => @product3}
+    post "/api/source/push_objects",
+      {:user_id => @u.id, :source_id => @s_fields[:name], :objects => data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    last_response.headers["Warning"].index('deprecated').should_not == nil
+    verify_doc_result(@s, {:md => data, :md_size=>'3'})
+  end
+
+  it "should push new objects to rhoconnect's :md with oldest api route and deprecation warning" do
+    data = {'1' => @product1, '2' => @product2, '3' => @product3}
+    post "/api/push_objects",
+      {:user_id => @u.id, :source_id => @s_fields[:name], :objects => data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    last_response.headers["Warning"].index('deprecated').should_not == nil
+    verify_doc_result(@s, {:md => data, :md_size=>'3'})
+  end
 
-    it "should push updates to existing objects to rhoconnect's :md" do
-      data = {'1' => @product1, '2' => @product2, '3' => @product3}
-      update = {'price' => '0.99', 'new_field' => 'value'}
-      @s = Source.load(@s_fields[:name],@s_params)
-      set_doc_state(@s, {:md => data, :md_size => '3'})
-      update.each do |key,value|
-        data['2'][key] = value
-      end
-      post "/app/#{Rhoconnect::API_VERSION}/#{@s_fields[:name]}/push_objects",
-        {:user_id => @u.id, :objects => {'2'=>update}}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      verify_doc_result(@s, {:md => data, :md_size=>'3'})
+  it "should push updates to existing objects to rhoconnect's :md" do
+    data = {'1' => @product1, '2' => @product2, '3' => @product3}
+    update = {'price' => '0.99', 'new_field' => 'value'}
+    @s = Source.load(@s_fields[:name],@s_params)
+    set_doc_state(@s, {:md => data, :md_size => '3'})
+    update.each do |key,value|
+      data['2'][key] = value
     end
-  end  
+    post "/app/#{Rhoconnect::API_VERSION}/#{@s_fields[:name]}/push_objects",
+      {:user_id => @u.id, :objects => {'2'=>update}}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    verify_doc_result(@s, {:md => data, :md_size=>'3'})
+  end
 end

data/spec/api/client/client_get_db_doc_spec.rb

@@ -1,33 +1,33 @@
 require File.join(File.dirname(__FILE__),'..','api_helper')
 
 describe "RhoconnectApiClientGetDbDoc" do
-  it_should_behave_like "ApiHelper" do
-    it "should get clients's db document by doc key and data" do
-      data = {'1' => {'foo' => 'bar'}}
-      Client.define_valid_doctypes([:myclientdoc])
-      dockey = 'myclientdoc'
-      post "/rc/#{Rhoconnect::API_VERSION}/clients/#{@c.id}/sources/#{@c.source_name}/docs/#{dockey}", {:data => data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      get "/rc/#{Rhoconnect::API_VERSION}/clients/#{@c.id}/sources/#{@c.source_name}/docs/#{dockey}", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      JSON.parse(last_response.body).should == data
-      Client.valid_doctypes.delete(dockey.to_sym)
-    end
-    
-    it "should append data to the client's db document by doc name and data" do
-      data = {'1' => {'foo' => 'bar'}}
-      data2 = {'2' => {'foo1' => 'bar1'}}
-      data3 = data.merge(data2)
-      dockey = 'abc:abc'
-      Client.define_valid_doctypes([dockey])
-      post "/rc/#{Rhoconnect::API_VERSION}/clients/#{@c.id}/sources/#{@c.source_name}/docs/#{dockey}", {:data => data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      verify_doc_result(@c, dockey => data)
-      
-      post "/rc/#{Rhoconnect::API_VERSION}/clients/#{@c.id}/sources/#{@c.source_name}/docs/#{dockey}", {:data => data2, :append => true}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      verify_doc_result(@c, dockey => data3)
-      Client.valid_doctypes.delete(dockey.to_sym)
-    end
-  end  
+  include_examples "ApiHelper"
+
+  it "should get clients's db document by doc key and data" do
+    data = {'1' => {'foo' => 'bar'}}
+    Client.define_valid_doctypes([:myclientdoc])
+    dockey = 'myclientdoc'
+    post "/rc/#{Rhoconnect::API_VERSION}/clients/#{@c.id}/sources/#{@c.source_name}/docs/#{dockey}", {:data => data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    get "/rc/#{Rhoconnect::API_VERSION}/clients/#{@c.id}/sources/#{@c.source_name}/docs/#{dockey}", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    JSON.parse(last_response.body).should == data
+    Client.valid_doctypes.delete(dockey.to_sym)
+  end
+
+  it "should append data to the client's db document by doc name and data" do
+    data = {'1' => {'foo' => 'bar'}}
+    data2 = {'2' => {'foo1' => 'bar1'}}
+    data3 = data.merge(data2)
+    dockey = 'abc:abc'
+    Client.define_valid_doctypes([dockey])
+    post "/rc/#{Rhoconnect::API_VERSION}/clients/#{@c.id}/sources/#{@c.source_name}/docs/#{dockey}", {:data => data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    verify_doc_result(@c, dockey => data)
+
+    post "/rc/#{Rhoconnect::API_VERSION}/clients/#{@c.id}/sources/#{@c.source_name}/docs/#{dockey}", {:data => data2, :append => true}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    verify_doc_result(@c, dockey => data3)
+    Client.valid_doctypes.delete(dockey.to_sym)
+  end
 end

data/spec/api/client/client_set_db_doc_spec.rb

@@ -1,15 +1,15 @@
 require File.join(File.dirname(__FILE__),'..','api_helper')
 
 describe "RhoconnectApiClientSetDbDoc" do
-  it_should_behave_like "ApiHelper" do
-    it "should set client's db document by doc key and data" do
-      data = {'1' => {'foo' => 'bar'}}
-      dockey = 'myclientdoc'
-      Client.define_valid_doctypes([dockey])
-      post "/rc/#{Rhoconnect::API_VERSION}/clients/#{@c.id}/sources/#{@c.source_name}/docs/#{dockey}", {:data => data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      verify_doc_result(@c, dockey => data)
-      Client.valid_doctypes.delete(dockey.to_sym)
-    end
-  end  
+  include_examples "ApiHelper"
+
+  it "should set client's db document by doc key and data" do
+    data = {'1' => {'foo' => 'bar'}}
+    dockey = 'myclientdoc'
+    Client.define_valid_doctypes([dockey])
+    post "/rc/#{Rhoconnect::API_VERSION}/clients/#{@c.id}/sources/#{@c.source_name}/docs/#{dockey}", {:data => data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    verify_doc_result(@c, dockey => data)
+    Client.valid_doctypes.delete(dockey.to_sym)
+  end
 end

data/spec/api/client/get_client_params_spec.rb

@@ -1,33 +1,33 @@
 require File.join(File.dirname(__FILE__),'..','api_helper')
 
 describe "RhoconnectApiGetClientParams" do
-  it_should_behave_like "ApiHelper" do
-    it "should list client attributes" do
-      get "/rc/#{Rhoconnect::API_VERSION}/clients/#{@c.id}",  {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      res = JSON.parse(last_response.body)
-      res.delete_if { |attrib| attrib['name'] == 'rho__id' || attrib['name'] == 'last_sync'}
-      res.sort{|x,y| x['name']<=>y['name']}.should == [
-        {"name"=>"device_type", "value"=>"Apple", "type"=>"string"}, 
-        {"name"=>"device_pin", "value"=>"abcd", "type"=>"string"}, 
-        {"name"=>"device_port", "value"=>"3333", "type"=>"string"},
-        {"name"=>"device_push_type", "type"=>"string", "value"=>nil},  
-        {"name"=>"user_id", "value"=>"testuser", "type"=>"string"}, 
-        {"name"=>"phone_id", "value"=>nil, "type"=>"string"},
-        {"name"=>"app_id", "value"=>"application", "type"=>"string"}].sort{|x,y| x['name']<=>y['name']}
-    end
-    
-    it "should list client attributes with old route and deprecation warning" do
-      post "/api/get_client_params", {:api_token => @api_token, :client_id =>@c.id}
-      res = JSON.parse(last_response.body)
-      res.delete_if { |attrib| attrib['name'] == 'rho__id' || attrib['name'] == 'last_sync'}
-      res.sort{|x,y| x['name']<=>y['name']}.should == [
-        {"name"=>"device_type", "value"=>"Apple", "type"=>"string"}, 
-        {"name"=>"device_pin", "value"=>"abcd", "type"=>"string"}, 
-        {"name"=>"device_port", "value"=>"3333", "type"=>"string"},
-        {"name"=>"device_push_type", "type"=>"string", "value"=>nil}, 
-        {"name"=>"user_id", "value"=>"testuser", "type"=>"string"}, 
-        {"name"=>"phone_id", "value"=>nil, "type"=>"string"},
-        {"name"=>"app_id", "value"=>"application", "type"=>"string"}].sort{|x,y| x['name']<=>y['name']}
-    end
-  end  
+  include_examples "ApiHelper"
+
+  it "should list client attributes" do
+    get "/rc/#{Rhoconnect::API_VERSION}/clients/#{@c.id}",  {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    res = JSON.parse(last_response.body)
+    res.delete_if { |attrib| attrib['name'] == 'rho__id' || attrib['name'] == 'last_sync'}
+    res.sort{|x,y| x['name']<=>y['name']}.should == [
+      {"name"=>"device_type", "value"=>"Apple", "type"=>"string"},
+      {"name"=>"device_pin", "value"=>"abcd", "type"=>"string"},
+      {"name"=>"device_port", "value"=>"3333", "type"=>"string"},
+      {"name"=>"device_push_type", "type"=>"string", "value"=>nil},
+      {"name"=>"user_id", "value"=>"testuser", "type"=>"string"},
+      {"name"=>"phone_id", "value"=>nil, "type"=>"string"},
+      {"name"=>"app_id", "value"=>"application", "type"=>"string"}].sort{|x,y| x['name']<=>y['name']}
+  end
+
+  it "should list client attributes with old route and deprecation warning" do
+    post "/api/get_client_params", {:api_token => @api_token, :client_id =>@c.id}
+    res = JSON.parse(last_response.body)
+    res.delete_if { |attrib| attrib['name'] == 'rho__id' || attrib['name'] == 'last_sync'}
+    res.sort{|x,y| x['name']<=>y['name']}.should == [
+      {"name"=>"device_type", "value"=>"Apple", "type"=>"string"},
+      {"name"=>"device_pin", "value"=>"abcd", "type"=>"string"},
+      {"name"=>"device_port", "value"=>"3333", "type"=>"string"},
+      {"name"=>"device_push_type", "type"=>"string", "value"=>nil},
+      {"name"=>"user_id", "value"=>"testuser", "type"=>"string"},
+      {"name"=>"phone_id", "value"=>nil, "type"=>"string"},
+      {"name"=>"app_id", "value"=>"application", "type"=>"string"}].sort{|x,y| x['name']<=>y['name']}
+  end
 end

data/spec/api/client/list_client_docs_spec.rb

@@ -1,42 +1,40 @@
 require File.join(File.dirname(__FILE__),'..','api_helper')
 
 describe "RhoconnectApiListClientDocs" do
-  it_should_behave_like "ApiHelper" do
-    it "should list client documents" do
-      source_id = "SimpleAdapter"
+  include_examples "ApiHelper"
 
-      Client.define_valid_doctypes(['mycustomdoc'])
-      get "/rc/#{Rhoconnect::API_VERSION}/clients/#{@c.id}/sources/#{source_id}/docnames", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      JSON.parse(last_response.body).should == {
-        "cd"=>"client:application:testuser:#{@c.id}:#{source_id}:cd", 
-        "cd_size"=>"client:application:testuser:#{@c.id}:#{source_id}:cd_size", 
-        "page"=>"client:application:testuser:#{@c.id}:#{source_id}:page", 
-        "delete_page"=>"client:application:testuser:#{@c.id}:#{source_id}:delete_page", 
-        "create_links"=>"client:application:testuser:#{@c.id}:#{source_id}:create_links", 
-        "create_links_page"=>"client:application:testuser:#{@c.id}:#{source_id}:create_links_page", 
-        "metadata_page"=>"client:application:testuser:#{@c.id}:#{source_id}:metadata_page", 
-        "total_count_page"=>"client:application:testuser:#{@c.id}:#{source_id}:total_count_page", 
-        "page_token"=>"client:application:testuser:#{@c.id}:#{source_id}:page_token", 
-        "schema_sha1"=>"client:application:testuser:#{@c.id}:#{source_id}:schema_sha1", 
-        "schema_page"=>"client:application:testuser:#{@c.id}:#{source_id}:schema_page", 
-        "metadata_sha1"=>"client:application:testuser:#{@c.id}:#{source_id}:metadata_sha1", 
-        "search"=>"client:application:testuser:#{@c.id}:#{source_id}:search", 
-        "search_token"=>"client:application:testuser:#{@c.id}:#{source_id}:search_token", 
-        "search_page"=>"client:application:testuser:#{@c.id}:#{source_id}:search_page", 
-        "search_errors"=>"client:application:testuser:#{@c.id}:#{source_id}:search_errors", 
-        "create_errors"=>"client:application:testuser:#{@c.id}:#{source_id}:create_errors", 
-        "create_errors_page"=>"client:application:testuser:#{@c.id}:#{source_id}:create_errors_page", 
-        "update_errors"=>"client:application:testuser:#{@c.id}:#{source_id}:update_errors", 
-        "update_errors_page"=>"client:application:testuser:#{@c.id}:#{source_id}:update_errors_page", 
-        "update_rollback"=>"client:application:testuser:#{@c.id}:#{source_id}:update_rollback", 
-        "update_rollback_page"=>"client:application:testuser:#{@c.id}:#{source_id}:update_rollback_page", 
-        "delete_errors"=>"client:application:testuser:#{@c.id}:#{source_id}:delete_errors", 
-        "delete_errors_page"=>"client:application:testuser:#{@c.id}:#{source_id}:delete_errors_page", 
+  it "should list client documents" do
+    source_id = "SimpleAdapter"
+    Client.define_valid_doctypes(['mycustomdoc'])
+    get "/rc/#{Rhoconnect::API_VERSION}/clients/#{@c.id}/sources/#{source_id}/docnames", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    JSON.parse(last_response.body).should == {
+      "cd"=>"client:application:testuser:#{@c.id}:#{source_id}:cd",
+      "cd_size"=>"client:application:testuser:#{@c.id}:#{source_id}:cd_size",
+      "page"=>"client:application:testuser:#{@c.id}:#{source_id}:page",
+      "delete_page"=>"client:application:testuser:#{@c.id}:#{source_id}:delete_page",
+      "create_links"=>"client:application:testuser:#{@c.id}:#{source_id}:create_links",
+      "create_links_page"=>"client:application:testuser:#{@c.id}:#{source_id}:create_links_page",
+      "metadata_page"=>"client:application:testuser:#{@c.id}:#{source_id}:metadata_page",
+      "total_count_page"=>"client:application:testuser:#{@c.id}:#{source_id}:total_count_page",
+      "page_token"=>"client:application:testuser:#{@c.id}:#{source_id}:page_token",
+      "schema_sha1"=>"client:application:testuser:#{@c.id}:#{source_id}:schema_sha1",
+      "schema_page"=>"client:application:testuser:#{@c.id}:#{source_id}:schema_page",
+      "metadata_sha1"=>"client:application:testuser:#{@c.id}:#{source_id}:metadata_sha1",
+      "search"=>"client:application:testuser:#{@c.id}:#{source_id}:search",
+      "search_token"=>"client:application:testuser:#{@c.id}:#{source_id}:search_token",
+      "search_page"=>"client:application:testuser:#{@c.id}:#{source_id}:search_page",
+      "search_errors"=>"client:application:testuser:#{@c.id}:#{source_id}:search_errors",
+      "create_errors"=>"client:application:testuser:#{@c.id}:#{source_id}:create_errors",
+      "create_errors_page"=>"client:application:testuser:#{@c.id}:#{source_id}:create_errors_page",
+      "update_errors"=>"client:application:testuser:#{@c.id}:#{source_id}:update_errors",
+      "update_errors_page"=>"client:application:testuser:#{@c.id}:#{source_id}:update_errors_page",
+      "update_rollback"=>"client:application:testuser:#{@c.id}:#{source_id}:update_rollback",
+      "update_rollback_page"=>"client:application:testuser:#{@c.id}:#{source_id}:update_rollback_page",
+      "delete_errors"=>"client:application:testuser:#{@c.id}:#{source_id}:delete_errors",
+      "delete_errors_page"=>"client:application:testuser:#{@c.id}:#{source_id}:delete_errors_page",
+      "mycustomdoc"=>"client:application:testuser:#{@c.id}:#{source_id}:mycustomdoc"}
 
-        "mycustomdoc"=>"client:application:testuser:#{@c.id}:#{source_id}:mycustomdoc"}
-
-      Client.valid_doctypes.delete('mycustomdoc'.to_sym)
-    end
+    Client.valid_doctypes.delete('mycustomdoc'.to_sym)
   end
 end
 

data/spec/api/client/reset_spec.rb

@@ -1,36 +1,36 @@
 require File.join(File.dirname(__FILE__),'..','api_helper')
 
 describe "RhoconnectApiClientReset" do
-  it_should_behave_like "ApiHelper" do
-    before(:each) do
-      do_post "/rc/#{Rhoconnect::API_VERSION}/app/login",  "login" => @u.login, "password" => 'testpass'
-    end
+  include_examples "ApiHelper"
 
-    it "should handle client reset" do
-      set_doc_state(@c, :cd => @data)
-      post "/rc/#{Rhoconnect::API_VERSION}/clients/#{@c.id}/reset"
-      last_response.should be_ok
-      verify_doc_result(@c, :cd => {})
-      Client.load(@c.id,{:source_name => @s.name}).should_not be_nil
-    end
-      
-    it "should handle client reset on individual source adapters" do
-      @c.source_name = 'SampleAdapter'
-      set_doc_state(@c, :cd => @data)
-      verify_doc_result(@c, :cd => @data)
-        
-      @c.source_name = 'SimpleAdapter'
-      set_doc_state(@c, :cd => @data)
-      verify_doc_result(@c, :cd => @data)
-        
-      sources = [{'name'=>'SimpleAdapter'}]
-      do_post "/rc/#{Rhoconnect::API_VERSION}/clients/#{@c.id}/reset", {:sources => sources}
-      last_response.should be_ok
-        
-      @c.source_name = 'SampleAdapter'
-      verify_doc_result(@c, :cd => @data)
-      @c.source_name = 'SimpleAdapter'
-      verify_doc_result(@c, :cd => {})
-    end
+  before(:each) do
+    do_post "/rc/#{Rhoconnect::API_VERSION}/app/login",  "login" => @u.login, "password" => 'testpass'
+  end
+
+  it "should handle client reset" do
+    set_doc_state(@c, :cd => @data)
+    post "/rc/#{Rhoconnect::API_VERSION}/clients/#{@c.id}/reset"
+    last_response.should be_ok
+    verify_doc_result(@c, :cd => {})
+    Client.load(@c.id,{:source_name => @s.name}).should_not be_nil
+  end
+
+  it "should handle client reset on individual source adapters" do
+    @c.source_name = 'SampleAdapter'
+    set_doc_state(@c, :cd => @data)
+    verify_doc_result(@c, :cd => @data)
+
+    @c.source_name = 'SimpleAdapter'
+    set_doc_state(@c, :cd => @data)
+    verify_doc_result(@c, :cd => @data)
+
+    sources = [{'name'=>'SimpleAdapter'}]
+    do_post "/rc/#{Rhoconnect::API_VERSION}/clients/#{@c.id}/reset", {:sources => sources}
+    last_response.should be_ok
+
+    @c.source_name = 'SampleAdapter'
+    verify_doc_result(@c, :cd => @data)
+    @c.source_name = 'SimpleAdapter'
+    verify_doc_result(@c, :cd => {})
   end
 end

data/spec/api/readstate/set_refresh_time_spec.rb

@@ -1,49 +1,49 @@
 require File.join(File.dirname(__FILE__),'..','api_helper')
 
 describe "RhoconnectApiSetRefreshTime" do
-  it_should_behave_like "ApiHelper" do
-    it "should set refresh time to 100s from 'now'" do
-      before = Time.now.to_i
-      put "/rc/#{Rhoconnect::API_VERSION}/readstate/users/#{@u_fields[:login]}/sources/#{@s_fields[:name]}",  
-        {:refresh_time => 100}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      after = Time.now.to_i
-      last_response.should be_ok
-      @s = Source.load(@s.id,@s_params)
-      @s.read_state.refresh_time.should >= before + 100
-      @s.read_state.refresh_time.should <= after + 100
-    end
+  include_examples "ApiHelper"
 
-    it "should set refresh time to 'now' if no refresh_time provided" do
-      before = Time.now.to_i
-      put "/rc/#{Rhoconnect::API_VERSION}/readstate/users/#{@u_fields[:login]}/sources/#{@s_fields[:name]}", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      after = Time.now.to_i
-      last_response.should be_ok
-      @s = Source.load(@s.id,@s_params)
-      @s.read_state.refresh_time.should >= before
-      @s.read_state.refresh_time.should <= after
-    end
+  it "should set refresh time to 100s from 'now'" do
+    before = Time.now.to_i
+    put "/rc/#{Rhoconnect::API_VERSION}/readstate/users/#{@u_fields[:login]}/sources/#{@s_fields[:name]}",
+      {:refresh_time => 100}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    after = Time.now.to_i
+    last_response.should be_ok
+    @s = Source.load(@s.id,@s_params)
+    @s.read_state.refresh_time.should >= before + 100
+    @s.read_state.refresh_time.should <= after + 100
+  end
 
-    it "should set poll interval" do
-      put "/rc/#{Rhoconnect::API_VERSION}/readstate/users/#{@u_fields[:login]}/sources/#{@s_fields[:name]}", {:poll_interval => 100}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      @s = Source.load(@s.id,@s_params)
-      @s.poll_interval.should == 100
-    end
-    
-    it "should should not set nil poll interval with old route and deprecation warning" do
-      post "/api/set_refresh_time", :api_token => @api_token, 
-        :source_name => @s_fields[:name], :user_name => @u_fields[:login], :poll_interval => nil
-      last_response.should be_ok
-      last_response.headers["Warning"].index('deprecated').should_not == nil
-      @s = Source.load(@s.id,@s_params)
-      @s.poll_interval.should == 300
-    end
-    
-    it "should should not set nil poll interval" do
-      put "/rc/#{Rhoconnect::API_VERSION}/readstate/users/#{@u_fields[:login]}/sources/#{@s_fields[:name]}", {:poll_interval => nil}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      @s = Source.load(@s.id,@s_params)
-      @s.poll_interval.should == 300
-    end
-  end  
+  it "should set refresh time to 'now' if no refresh_time provided" do
+    before = Time.now.to_i
+    put "/rc/#{Rhoconnect::API_VERSION}/readstate/users/#{@u_fields[:login]}/sources/#{@s_fields[:name]}", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    after = Time.now.to_i
+    last_response.should be_ok
+    @s = Source.load(@s.id,@s_params)
+    @s.read_state.refresh_time.should >= before
+    @s.read_state.refresh_time.should <= after
+  end
+
+  it "should set poll interval" do
+    put "/rc/#{Rhoconnect::API_VERSION}/readstate/users/#{@u_fields[:login]}/sources/#{@s_fields[:name]}", {:poll_interval => 100}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    @s = Source.load(@s.id,@s_params)
+    @s.poll_interval.should == 100
+  end
+
+  it "should should not set nil poll interval with old route and deprecation warning" do
+    post "/api/set_refresh_time", :api_token => @api_token,
+      :source_name => @s_fields[:name], :user_name => @u_fields[:login], :poll_interval => nil
+    last_response.should be_ok
+    last_response.headers["Warning"].index('deprecated').should_not == nil
+    @s = Source.load(@s.id,@s_params)
+    @s.poll_interval.should == 300
+  end
+
+  it "should should not set nil poll interval" do
+    put "/rc/#{Rhoconnect::API_VERSION}/readstate/users/#{@u_fields[:login]}/sources/#{@s_fields[:name]}", {:poll_interval => nil}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    @s = Source.load(@s.id,@s_params)
+    @s.poll_interval.should == 300
+  end
 end

data/spec/api/source/get_source_params_spec.rb

@@ -1,41 +1,39 @@
 require File.join(File.dirname(__FILE__),'..','api_helper')
 
 describe "RhoconnectApiGetSourceParams" do
+  include_examples "ApiHelper"
 
-  it_should_behave_like "ApiHelper" do
-
-    it "should list source attributes" do
-      source_id = "SampleAdapter"
-      get "/rc/#{Rhoconnect::API_VERSION}/sources/#{source_id}", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      result = JSON.parse(last_response.body).sort {|x,y| y["name"] <=> x["name"] }
-      expected = [
-        {"name"=>"rho__id", "value"=>"SampleAdapter", "type"=>"string"},
-        {"name"=>"source_id", "value"=>nil, "type"=>"integer"},
-        {"name"=>"name", "value"=>"SampleAdapter", "type"=>"string"},
-        {"name"=>"url", "value"=>"http://example.com", "type"=>"string"},
-        {"name"=>"login", "value"=>"testuser", "type"=>"string"},
-        {"name"=>"password", "value"=>"testpass", "type"=>"string"},
-        {"name"=>"priority", "value"=>1, "type"=>"integer"},
-        {"name"=>"callback_url", "value"=>nil, "type"=>"string"},
-        {"name"=>"poll_interval", "value"=>300, "type"=>"integer"},
-        {"name"=>"retry_limit", "type"=>"integer", "value"=>0},
-        {"name"=>"simulate_time", "value"=>0, "type"=>"integer"},
-        {"name"=>"partition_type", "value"=>"user", "type"=>"string"},
-        {"name"=>"push_notify", "value"=>"false", "type"=>"string"},
-        {"name"=>"sync_type", "value"=>"incremental", "type"=>"string"},
-        {"name"=>"belongs_to", "type"=>"string", "value"=>nil},
-        {"name"=>"has_many", "type"=>"string", "value"=>"FixedSchemaAdapter,brand"},
-        {"name"=>"id", "value"=>"SampleAdapter", "type"=>"string"},
-        {"name"=>"queue", "value"=>nil, "type"=>"string"},
-        {"name"=>"query_queue", "value"=>nil, "type"=>"string"},
-        {"name"=>"pass_through", "value"=>nil, "type"=>"string"},
-        {"name"=>"cud_queue", "value"=>nil, "type"=>"string"}].sort {|x,y| y["name"] <=> x["name"] }
-      result.each_with_index do |item,i|
-        expect = expected[i]
-        item['name'].should == expect['name']
-        item['value'].should == expect['value']
-        item['type'].should == expect['type']
-      end
+  it "should list source attributes" do
+    source_id = "SampleAdapter"
+    get "/rc/#{Rhoconnect::API_VERSION}/sources/#{source_id}", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    result = JSON.parse(last_response.body).sort {|x,y| y["name"] <=> x["name"] }
+    expected = [
+      {"name"=>"rho__id", "value"=>"SampleAdapter", "type"=>"string"},
+      {"name"=>"source_id", "value"=>nil, "type"=>"integer"},
+      {"name"=>"name", "value"=>"SampleAdapter", "type"=>"string"},
+      {"name"=>"url", "value"=>"http://example.com", "type"=>"string"},
+      {"name"=>"login", "value"=>"testuser", "type"=>"string"},
+      {"name"=>"password", "value"=>"testpass", "type"=>"string"},
+      {"name"=>"priority", "value"=>1, "type"=>"integer"},
+      {"name"=>"callback_url", "value"=>nil, "type"=>"string"},
+      {"name"=>"poll_interval", "value"=>300, "type"=>"integer"},
+      {"name"=>"retry_limit", "type"=>"integer", "value"=>0},
+      {"name"=>"simulate_time", "value"=>0, "type"=>"integer"},
+      {"name"=>"partition_type", "value"=>"user", "type"=>"string"},
+      {"name"=>"push_notify", "value"=>"false", "type"=>"string"},
+      {"name"=>"sync_type", "value"=>"incremental", "type"=>"string"},
+      {"name"=>"belongs_to", "type"=>"string", "value"=>nil},
+      {"name"=>"has_many", "type"=>"string", "value"=>"FixedSchemaAdapter,brand"},
+      {"name"=>"id", "value"=>"SampleAdapter", "type"=>"string"},
+      {"name"=>"queue", "value"=>nil, "type"=>"string"},
+      {"name"=>"query_queue", "value"=>nil, "type"=>"string"},
+      {"name"=>"pass_through", "value"=>nil, "type"=>"string"},
+      {"name"=>"cud_queue", "value"=>nil, "type"=>"string"}].sort {|x,y| y["name"] <=> x["name"] }
+    result.each_with_index do |item,i|
+      expect = expected[i]
+      item['name'].should == expect['name']
+      item['value'].should == expect['value']
+      item['type'].should == expect['type']
     end
   end
 end