rhoconnect 4.0.4 → 5.1.1

data/spec/predefined_adapters/rho_internal_bench_adapter_controller_js_spec.rb

@@ -5,107 +5,106 @@ require File.join(File.dirname(__FILE__),'..','..','lib','rhoconnect','server.rb
 describe "Rhoconnect::RhoInternalJsBenchAdapterController" do
   include Rack::Test::Methods
   include Rhoconnect
+  include_examples "SharedRhoconnectHelper", :rhoconnect_data => true
 
-  it_behaves_like "SharedRhoconnectHelper", :rhoconnect_data => true do
-    def app
-      @app ||= Rack::URLMap.new Rhoconnect.url_map
-    end
-
-    before(:each) do
-      Rhoconnect::Server.set :environment, :test
-      Rhoconnect::Server.set :secret, "secure!"
-      Rhoconnect.use_node = true
-      Rhoconnect.bootstrap(get_testapp_path)
-      do_post "/rc/#{Rhoconnect::API_VERSION}/app/login", "login" => @u.login, "password" => 'testpass'
-    end
-
-    after(:each) do
-      Rhoconnect::Store.flush_all
-      Rhoconnect::Node.kill_process
-    end
-
-    it "should call query method" do
-      get '/app/v1/RhoInternalJsBenchAdapter', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
-      last_response.should be_ok
-      body = JSON.parse(last_response.body)
-    end
-
-    it "should call create method" do
-      hsh = {'create'=>{'1'=>{'mockId'=>'1','name'=>'testname','price'=>'$199'}}}
-      post '/app/v1/RhoInternalJsBenchAdapter', hsh,{Rhoconnect::CLIENT_ID_HEADER => @c.id}
-      last_response.should be_ok
-      
-      get '/app/v1/RhoInternalJsBenchAdapter', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
-      body = JSON.parse(last_response.body)
-      body[5]["insert"]["mockId"]["mockId"].should == "1"
-    end
-
-    it "should call update method" do
-      get '/app/v1/RhoInternalJsBenchAdapter', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
-      body = JSON.parse(last_response.body)
-      body[4]["total_count"].should == 0
-
-      hsh = {'create'=>{'1'=>{'mockId'=>'1','name'=>'testname','price'=>'$199'}}}
-      post '/app/v1/RhoInternalJsBenchAdapter', hsh,{Rhoconnect::CLIENT_ID_HEADER => @c.id}
-      last_response.should be_ok
-
-      get '/app/v1/RhoInternalJsBenchAdapter', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
-      body = JSON.parse(last_response.body)
-      token =  last_response.headers["X-Rhoconnect-PAGE-TOKEN"]
-      count = body[4]["total_count"]
-      count.should == 1
-
-      get '/app/v1/RhoInternalJsBenchAdapter', {:token=>token}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
-      body = JSON.parse(last_response.body)
-      count = body[4]["total_count"]
-      count.should == 1
-
-      hsh = {'update'=>{'mockId'=>'1','name'=>'updatename'}}
-      put '/app/v1/RhoInternalJsBenchAdapter/mockId',hsh, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
-      last_response.should be_ok
-
-      get '/app/v1/RhoInternalJsBenchAdapter', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
-      body = JSON.parse(last_response.body)
-      puts "body is #{body}"
-      token =  last_response.headers["X-Rhoconnect-PAGE-TOKEN"]
-      #body[5]["insert"]["mockId"]["name"].should == "updatename"
-
-      get '/app/v1/RhoInternalJsBenchAdapter', {:token=>token}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
-      body = JSON.parse(last_response.body)
-      puts "body is #{body}"
-      last_response.should be_ok
-    end
-
-    it "should call delete method" do 
-      get '/app/v1/RhoInternalJsBenchAdapter', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
-      body = JSON.parse(last_response.body)
-      body[4]["total_count"].should == 0
-
-      hsh = {'create'=>{'1'=>{'mockId'=>'1','name'=>'testname','price'=>'$199'}}}
-      post '/app/v1/RhoInternalJsBenchAdapter', hsh,{Rhoconnect::CLIENT_ID_HEADER => @c.id}
-      last_response.should be_ok
-
-      get '/app/v1/RhoInternalJsBenchAdapter', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
-      body    = JSON.parse(last_response.body)
-      token =  last_response.headers["X-Rhoconnect-PAGE-TOKEN"]
-      count = body[4]["total_count"]
-      count.should == 1
-
-      get '/app/v1/RhoInternalJsBenchAdapter', {:token => token}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
-      body = JSON.parse(last_response.body)
-      count = body[4]["total_count"]
-      count.should == 1
-
-      delete '/app/v1/RhoInternalJsBenchAdapter/1',{}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
-      last_response.should be_ok
-
-      get '/app/v1/RhoInternalJsBenchAdapter', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
-      body    = JSON.parse(last_response.body)
-      token =  last_response.headers["X-Rhoconnect-PAGE-TOKEN"]
-
-      get '/app/v1/RhoInternalJsBenchAdapter', {:token => token}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
-      body = JSON.parse(last_response.body)
-      body[4]["total_count"].should == 0
-    end
+  def app
+    @app ||= Rack::URLMap.new Rhoconnect.url_map
+  end
+
+  before(:each) do
+    Rhoconnect::Server.set :environment, :test
+    Rhoconnect::Server.set :secret, "secure!"
+    Rhoconnect.use_node = true
+    Rhoconnect.bootstrap(get_testapp_path)
+    do_post "/rc/#{Rhoconnect::API_VERSION}/app/login", "login" => @u.login, "password" => 'testpass'
+  end
+
+  after(:each) do
+    Rhoconnect::Store.flush_all
+    Rhoconnect::Node.kill_process
+  end
+
+  it "should call query method" do
+    get '/app/v1/RhoInternalJsBenchAdapter', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+    last_response.should be_ok
+    body = JSON.parse(last_response.body)
+  end
+
+  it "should call create method" do
+    hsh = {'create'=>{'1'=>{'mockId'=>'1','name'=>'testname','price'=>'$199'}}}
+    post '/app/v1/RhoInternalJsBenchAdapter', hsh,{Rhoconnect::CLIENT_ID_HEADER => @c.id}
+    last_response.should be_ok
+
+    get '/app/v1/RhoInternalJsBenchAdapter', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+    body = JSON.parse(last_response.body)
+    body[5]["insert"]["mockId"]["mockId"].should == "1"
+  end
+
+  it "should call update method" do
+    get '/app/v1/RhoInternalJsBenchAdapter', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+    body = JSON.parse(last_response.body)
+    body[4]["total_count"].should == 0
+
+    hsh = {'create'=>{'1'=>{'mockId'=>'1','name'=>'testname','price'=>'$199'}}}
+    post '/app/v1/RhoInternalJsBenchAdapter', hsh,{Rhoconnect::CLIENT_ID_HEADER => @c.id}
+    last_response.should be_ok
+
+    get '/app/v1/RhoInternalJsBenchAdapter', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+    body = JSON.parse(last_response.body)
+    token =  last_response.headers["X-Rhoconnect-PAGE-TOKEN"]
+    count = body[4]["total_count"]
+    count.should == 1
+
+    get '/app/v1/RhoInternalJsBenchAdapter', {:token=>token}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+    body = JSON.parse(last_response.body)
+    count = body[4]["total_count"]
+    count.should == 1
+
+    hsh = {'update'=>{'mockId'=>'1','name'=>'updatename'}}
+    put '/app/v1/RhoInternalJsBenchAdapter/mockId',hsh, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+    last_response.should be_ok
+
+    get '/app/v1/RhoInternalJsBenchAdapter', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+    body = JSON.parse(last_response.body)
+    puts "body is #{body}"
+    token =  last_response.headers["X-Rhoconnect-PAGE-TOKEN"]
+    #body[5]["insert"]["mockId"]["name"].should == "updatename"
+
+    get '/app/v1/RhoInternalJsBenchAdapter', {:token=>token}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+    body = JSON.parse(last_response.body)
+    puts "body is #{body}"
+    last_response.should be_ok
+  end
+
+  it "should call delete method" do
+    get '/app/v1/RhoInternalJsBenchAdapter', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+    body = JSON.parse(last_response.body)
+    body[4]["total_count"].should == 0
+
+    hsh = {'create'=>{'1'=>{'mockId'=>'1','name'=>'testname','price'=>'$199'}}}
+    post '/app/v1/RhoInternalJsBenchAdapter', hsh,{Rhoconnect::CLIENT_ID_HEADER => @c.id}
+    last_response.should be_ok
+
+    get '/app/v1/RhoInternalJsBenchAdapter', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+    body    = JSON.parse(last_response.body)
+    token =  last_response.headers["X-Rhoconnect-PAGE-TOKEN"]
+    count = body[4]["total_count"]
+    count.should == 1
+
+    get '/app/v1/RhoInternalJsBenchAdapter', {:token => token}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+    body = JSON.parse(last_response.body)
+    count = body[4]["total_count"]
+    count.should == 1
+
+    delete '/app/v1/RhoInternalJsBenchAdapter/1',{}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+    last_response.should be_ok
+
+    get '/app/v1/RhoInternalJsBenchAdapter', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+    body    = JSON.parse(last_response.body)
+    token =  last_response.headers["X-Rhoconnect-PAGE-TOKEN"]
+
+    get '/app/v1/RhoInternalJsBenchAdapter', {:token => token}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+    body = JSON.parse(last_response.body)
+    body[4]["total_count"].should == 0
   end
 end

data/spec/predefined_adapters/rho_internal_js_bench_adapter_js_spec.rb

@@ -3,42 +3,40 @@ require File.join(File.dirname(__FILE__),'..','..','lib','rhoconnect','server.rb
 
 describe "Rhoconnect::RhoInternalJsBenchAdapter" do
   include Rhoconnect
+  include_examples "SharedRhoconnectHelper", :rhoconnect_data => true
 
-  it_behaves_like "SharedRhoconnectHelper", :rhoconnect_data => true do
-    before(:each) do
-      Rhoconnect::Server.set :environment, :test
-      Rhoconnect::Server.set :secret, "secure!"
-      Rhoconnect.use_node = true
-      Rhoconnect.bootstrap(get_testapp_path)
-    end
-
-    def app
-      @app ||= Rack::URLMap.new Rhoconnect.url_map
-    end
+  before(:each) do
+    Rhoconnect::Server.set :environment, :test
+    Rhoconnect::Server.set :secret, "secure!"
+    Rhoconnect.use_node = true
+    Rhoconnect.bootstrap(get_testapp_path)
+  end
 
-    after(:each) do
-      Rhoconnect::Store.flush_all
-      Rhoconnect::Node.kill_process
-      #Source.valid_doctypes.delete('tmpdoc'.to_sym)
-    end
+  def app
+    @app ||= Rack::URLMap.new Rhoconnect.url_map
+  end
 
-    it "should call login method from model" do
-      rho_int = RhoInternalJsBenchAdapter.new(Source.load('RhoInternalJsBenchAdapter', {:app_id => @a.id, :user_id => @u.id}))
-      res = rho_int.login
-      res.should == true
-    end
+  after(:each) do
+    Rhoconnect::Store.flush_all
+    Rhoconnect::Node.kill_process
+    #Source.valid_doctypes.delete('tmpdoc'.to_sym)
+  end
 
-    it "should call logoff method from model" do
-      rho_int = RhoInternalJsBenchAdapter.new(Source.load('RhoInternalJsBenchAdapter', {:app_id => @a.id, :user_id => @u.id}))
-      res = rho_int.logoff
-      res.should == true
-    end
+  it "should call login method from model" do
+    rho_int = RhoInternalJsBenchAdapter.new(Source.load('RhoInternalJsBenchAdapter', {:app_id => @a.id, :user_id => @u.id}))
+    res = rho_int.login
+    res.should == true
+  end
 
-    it "should call query method from model" do
-      rho_int = RhoInternalJsBenchAdapter.new(Source.load('RhoInternalJsBenchAdapter', {:app_id => @a.id, :user_id => @u.id}))
-      res = rho_int.query
-      res.should == true
-    end
+  it "should call logoff method from model" do
+    rho_int = RhoInternalJsBenchAdapter.new(Source.load('RhoInternalJsBenchAdapter', {:app_id => @a.id, :user_id => @u.id}))
+    res = rho_int.logoff
+    res.should == true
+  end
 
+  it "should call query method from model" do
+    rho_int = RhoInternalJsBenchAdapter.new(Source.load('RhoInternalJsBenchAdapter', {:app_id => @a.id, :user_id => @u.id}))
+    res = rho_int.query
+    res.should == true
   end
 end

data/spec/read_state_spec.rb

@@ -1,34 +1,33 @@
 require File.join(File.dirname(__FILE__),'spec_helper')
 
 describe "ReadState" do
-  it_behaves_like "SharedRhoconnectHelper", :rhoconnect_data => false do
-    it "should create refresh with correct id" do
-      @r.id.should == "#{@a_fields[:name]}:#{@u_fields[:login]}:#{@s_fields[:name]}"
-    end
+  include_examples "SharedRhoconnectHelper", :rhoconnect_data => false
 
-    it "should create refresh with default fields" do
-      @r.refresh_time.should <= Time.now.to_i
-    end
+  it "should create refresh with correct id" do
+    @r.id.should == "#{@a_fields[:name]}:#{@u_fields[:login]}:#{@s_fields[:name]}"
+  end
+
+  it "should create refresh with default fields" do
+    @r.refresh_time.should <= Time.now.to_i
+  end
 
-    it "should load refresh with params" do
-      @r1 = ReadState.load(:app_id => @a_fields[:name],
-        :user_id => @u_fields[:login],:source_name => @s_fields[:name])
-      @r1.refresh_time.should <= Time.now.to_i
-    end
+  it "should load refresh with params" do
+    @r1 = ReadState.load(:app_id => @a_fields[:name],
+      :user_id => @u_fields[:login],:source_name => @s_fields[:name])
+    @r1.refresh_time.should <= Time.now.to_i
+  end
+
+  it "should delete read_state from db" do
+    ReadState.delete(@a_fields[:name])
+    Store.keys("read_state*").should == []
+  end
 
-    it "should delete read_state from db" do
-      ReadState.delete(@a_fields[:name])
-      Store.keys("read_state*").should == []
-    end
-    
-    it "should delete read_state from source" do
-      time = Time.now.to_i
-      @s.read_state.refresh_time = time
-      @s.load_read_state.refresh_time.should == time
+  it "should delete read_state from source" do
+    time = Time.now.to_i
+    @s.read_state.refresh_time = time
+    @s.load_read_state.refresh_time.should == time
 
-      @s.delete_user_read_state
-      @s.load_read_state.should == nil
-    end
-      
+    @s.delete_user_read_state
+    @s.load_read_state.should == nil
   end
 end

data/spec/rhoconnect_spec.rb

@@ -1,14 +1,14 @@
 require File.join(File.dirname(__FILE__),'spec_helper')
 
 describe "Rhoconnect" do
-  include TestHelpers    
-  let(:test_app_name) { 'application' }  
+  include TestHelpers
+  let(:test_app_name) { 'application' }
 
-  before(:each) do 
+  before(:each) do
     Store.create
     Store.flush_all
   end
-  
+
   it "should bootstrap Rhoconnect with block" do
     Rhoconnect.bootstrap(get_testapp_path) do |rhoconnect|
       rhoconnect.vendor_directory = 'foo'
@@ -31,7 +31,7 @@ describe "Rhoconnect" do
     Rhoconnect.environment.should == :production
     ENV.delete('RHO_ENV')
   end
-  
+
   it "should bootstrap Rhoconnect with RACK_ENV provided" do
     env = ENV['RACK_ENV'].dup
     ENV['RACK_ENV'] = 'production'
@@ -39,7 +39,7 @@ describe "Rhoconnect" do
     Rhoconnect.environment.should == :production
     ENV['RACK_ENV'] = env
   end
-  
+
   it "should bootstrap with existing app" do
     app = App.create(:name => test_app_name)
     App.should_receive(:load).once.with(test_app_name).and_return(app)
@@ -57,7 +57,7 @@ describe "Rhoconnect" do
     config[:sources]['FixedSchemaAdapter'].merge!(
       'schema' => {'property' => 'foo'}
     )
-    Rhoconnect.stub!(:get_config).and_return(config)
+    Rhoconnect.stub(:get_config).and_return(config)
     Rhoconnect.should_receive(:log).once.with(
       "ERROR: 'schema' field in settings.yml is not supported anymore, please use source adapter schema method!"
     )