rhoconnect 4.0.4 → 5.1.1

data/spec/api/source/list_sources_spec.rb

@@ -1,20 +1,20 @@
 require File.join(File.dirname(__FILE__),'..','api_helper')
 
 describe "RhoconnectApiListSources" do
-  it_should_behave_like "ApiHelper" do
-    it "should list all application sources using partition_type param" do
-      get "/rc/#{Rhoconnect::API_VERSION}/sources/type/all", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      JSON.parse(last_response.body).sort.should == ["SimpleAdapter", "SampleAdapter", "FixedSchemaAdapter", "OtherAdapter", "JsSample"].sort
-     end
+  include_examples "ApiHelper"
 
-    it "should list app partition sources" do
-      get "/rc/#{Rhoconnect::API_VERSION}/sources/type/app", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      JSON.parse(last_response.body).sort.should == ["SimpleAdapter", "OtherAdapter"].sort
-    end
+  it "should list all application sources using partition_type param" do
+    get "/rc/#{Rhoconnect::API_VERSION}/sources/type/all", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    JSON.parse(last_response.body).sort.should == ["SimpleAdapter", "SampleAdapter", "FixedSchemaAdapter", "OtherAdapter", "JsSample"].sort
+  end
+
+  it "should list app partition sources" do
+    get "/rc/#{Rhoconnect::API_VERSION}/sources/type/app", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    JSON.parse(last_response.body).sort.should == ["SimpleAdapter", "OtherAdapter"].sort
+  end
 
-    it "should list user partition sources" do
-      get "/rc/#{Rhoconnect::API_VERSION}/sources/type/user", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      JSON.parse(last_response.body).sort.should == ["SampleAdapter", "FixedSchemaAdapter", "JsSample"].sort
-    end
+  it "should list user partition sources" do
+    get "/rc/#{Rhoconnect::API_VERSION}/sources/type/user", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    JSON.parse(last_response.body).sort.should == ["SampleAdapter", "FixedSchemaAdapter", "JsSample"].sort
   end
 end

data/spec/api/source/update_source_params_spec.rb

@@ -1,24 +1,24 @@
 require File.join(File.dirname(__FILE__),'..','api_helper')
 
 describe "RhoconnectApiUpdateSourceParams" do
-  it_should_behave_like "ApiHelper" do
-    it "should set poll_interval to 99 seconds" do
-      @s1 = Source.load(@s.id,@s_params)
-      before = @s1.poll_interval.to_i
-      put "/rc/#{Rhoconnect::API_VERSION}/sources/#{@s_fields[:name]}", 
-        {:data => {:poll_interval => 99}}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      @s2 = Source.load(@s.id,@s_params)
-      after = @s2.poll_interval
-      before.should == 300
-      after.should == 99
-    end
+  include_examples "ApiHelper"
 
-    it "should fail to update the source if param is not found" do
-      put "/rc/#{Rhoconnect::API_VERSION}/sources/#{@s_fields[:name]}",
-        {:data => {:invalid_param => "invalid_data"}}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-        last_response.status.should == 500
-        last_response.body.match('undefined method').should_not be_nil
-    end
-  end  
+  it "should set poll_interval to 99 seconds" do
+    @s1 = Source.load(@s.id,@s_params)
+    before = @s1.poll_interval.to_i
+    put "/rc/#{Rhoconnect::API_VERSION}/sources/#{@s_fields[:name]}",
+      {:data => {:poll_interval => 99}}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    @s2 = Source.load(@s.id,@s_params)
+    after = @s2.poll_interval
+    before.should == 300
+    after.should == 99
+  end
+
+  it "should fail to update the source if param is not found" do
+    put "/rc/#{Rhoconnect::API_VERSION}/sources/#{@s_fields[:name]}",
+      {:data => {:invalid_param => "invalid_data"}}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+      last_response.status.should == 500
+      last_response.body.match('undefined method').should_not be_nil
+  end
 end

data/spec/api/store/get_db_doc_spec.rb

@@ -1,32 +1,32 @@
 require File.join(File.dirname(__FILE__),'..','api_helper')
 
 describe "RhoconnectApiGetDbDoc" do
-  it_should_behave_like "ApiHelper" do
-    it "should return db document by name" do
-      data = {'1' => {'foo' => 'bar'}}
-      set_state('abc:abc' => data)
-      dockey = 'abc:abc'
-      get "/rc/#{Rhoconnect::API_VERSION}/store/#{dockey}", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      JSON.parse(last_response.body).should == data
-    end
-    
-    it "should return db document by name and print deprecation warning with old route" do
-      data = {'1' => {'foo' => 'bar'}}
-      set_state('abc:abc' => data)
-      post "/api/get_db_doc", {:doc => 'abc:abc'}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      last_response.headers["Warning"].index('deprecated').should_not == nil
-      JSON.parse(last_response.body).should == data
-    end
+  include_examples "ApiHelper"
 
-    it "should return db document by name and data_type" do
-      data = 'some string'
-      set_state('abc:abc' => data)
-      dockey = 'abc:abc'
-      get "/rc/#{Rhoconnect::API_VERSION}/store/#{dockey}", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      last_response.body.should == data
-    end
-  end  
+  it "should return db document by name" do
+    data = {'1' => {'foo' => 'bar'}}
+    set_state('abc:abc' => data)
+    dockey = 'abc:abc'
+    get "/rc/#{Rhoconnect::API_VERSION}/store/#{dockey}", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    JSON.parse(last_response.body).should == data
+  end
+
+  it "should return db document by name and print deprecation warning with old route" do
+    data = {'1' => {'foo' => 'bar'}}
+    set_state('abc:abc' => data)
+    post "/api/get_db_doc", {:doc => 'abc:abc'}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    last_response.headers["Warning"].index('deprecated').should_not == nil
+    JSON.parse(last_response.body).should == data
+  end
+
+  it "should return db document by name and data_type" do
+    data = 'some string'
+    set_state('abc:abc' => data)
+    dockey = 'abc:abc'
+    get "/rc/#{Rhoconnect::API_VERSION}/store/#{dockey}", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    last_response.body.should == data
+  end
 end

data/spec/api/store/set_db_doc_spec.rb

@@ -1,43 +1,43 @@
 require File.join(File.dirname(__FILE__),'..','api_helper')
 
 describe "RhoconnectApiSetDbDoc" do
-  it_should_behave_like "ApiHelper" do
-    it "should set db document by doc name and data" do
-      data = {'1' => {'foo' => 'bar'}}
-      docname = 'application:abc'
-      post "/rc/#{Rhoconnect::API_VERSION}/store/#{docname}", {:data => data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      verify_result(docname => data)
-    end
+  include_examples "ApiHelper"
 
-    it "should set db document by doc name, data type, and data" do
-      data = 'some string'
-      docname = 'abc:abc:str'
-      post "/rc/#{Rhoconnect::API_VERSION}/store/#{docname}", {:data => data, :data_type => :string}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      verify_result('abc:abc:str' => data)
-    end
-    
-    it "should set db document by doc name, data type, and data with old route and deprecation warning" do
-      data = 'some string'
-      post "/api/set_db_doc", {:doc => 'abc:abc:str', :data => data, :data_type => :string}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.headers['Warning'].index('deprecated').should_not == nil
-      last_response.should be_ok
-      verify_result('abc:abc:str' => data)
-    end
-    
-    it "should append data in set db document by doc name and data" do
-      data = {'1' => {'foo' => 'bar'}}
-      data2 = {'2' => {'foo1' => 'bar1'}}
-      data3 = data.merge(data2)
-      docname = 'abc:abc'
-      post "/rc/#{Rhoconnect::API_VERSION}/store/#{docname}", {:data => data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      verify_result('abc:abc' => data)
-      
-      post "/rc/#{Rhoconnect::API_VERSION}/store/#{docname}", {:data => data2, :append => true}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      verify_result('abc:abc' => data3)
-    end
-  end  
+  it "should set db document by doc name and data" do
+    data = {'1' => {'foo' => 'bar'}}
+    docname = 'application:abc'
+    post "/rc/#{Rhoconnect::API_VERSION}/store/#{docname}", {:data => data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    verify_result(docname => data)
+  end
+
+  it "should set db document by doc name, data type, and data" do
+    data = 'some string'
+    docname = 'abc:abc:str'
+    post "/rc/#{Rhoconnect::API_VERSION}/store/#{docname}", {:data => data, :data_type => :string}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    verify_result('abc:abc:str' => data)
+  end
+
+  it "should set db document by doc name, data type, and data with old route and deprecation warning" do
+    data = 'some string'
+    post "/api/set_db_doc", {:doc => 'abc:abc:str', :data => data, :data_type => :string}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.headers['Warning'].index('deprecated').should_not == nil
+    last_response.should be_ok
+    verify_result('abc:abc:str' => data)
+  end
+
+  it "should append data in set db document by doc name and data" do
+    data = {'1' => {'foo' => 'bar'}}
+    data2 = {'2' => {'foo1' => 'bar1'}}
+    data3 = data.merge(data2)
+    docname = 'abc:abc'
+    post "/rc/#{Rhoconnect::API_VERSION}/store/#{docname}", {:data => data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    verify_result('abc:abc' => data)
+
+    post "/rc/#{Rhoconnect::API_VERSION}/store/#{docname}", {:data => data2, :append => true}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    verify_result('abc:abc' => data3)
+  end
 end

data/spec/api/system/adapter_spec.rb

@@ -1,33 +1,31 @@
 require File.join(File.dirname(__FILE__),'..','api_helper')
 
 describe "RhoconnectApiAppServer" do
-  it_should_behave_like "ApiHelper" do 
-    
-    it "should save adapter url" do
-      params = {:attributes => {:adapter_url => 'http://test.com'}}
-      post "/rc/#{Rhoconnect::API_VERSION}/system/appserver", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-    end
-    
-    it "should get adapter url" do
-      params = {}
-      get "/rc/#{Rhoconnect::API_VERSION}/system/appserver", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-    end
-    
-    it "should get check deprecation warning in /api/get_adapter" do
-      params = {}
-      post "/api/get_adapter", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      last_response.headers["Warning"].index('deprecated').should_not == nil
-    end
-    
-    it "should get check deprecation warning in /api/source/get_adapter" do
-      params = {}
-      post "/api/source/get_adapter", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      last_response.headers["Warning"].index('deprecated').should_not == nil
-    end
-  end  
- 
+  include_examples "ApiHelper"
+
+  it "should save adapter url" do
+    params = {:attributes => {:adapter_url => 'http://test.com'}}
+    post "/rc/#{Rhoconnect::API_VERSION}/system/appserver", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+  end
+
+  it "should get adapter url" do
+    params = {}
+    get "/rc/#{Rhoconnect::API_VERSION}/system/appserver", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+  end
+
+  it "should get check deprecation warning in /api/get_adapter" do
+    params = {}
+    post "/api/get_adapter", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    last_response.headers["Warning"].index('deprecated').should_not == nil
+  end
+
+  it "should get check deprecation warning in /api/source/get_adapter" do
+    params = {}
+    post "/api/source/get_adapter", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    last_response.headers["Warning"].index('deprecated').should_not == nil
+  end
 end

data/spec/api/system/get_license_info_spec.rb

@@ -1,15 +1,15 @@
 require File.join(File.dirname(__FILE__),'..','api_helper')
 
 describe "RhoconnectApiGetLicenseInfo" do
-  it_should_behave_like "ApiHelper" do
-    it "should get license info" do
-      get "/rc/#{Rhoconnect::API_VERSION}/system/license", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      JSON.parse(last_response.body).should == {
-        "available" => 9, 
-        "issued" => "Fri Apr 23 17:20:13 -0700 2010", 
-        "seats" => 10, 
-        "rhoconnect_version" => "Version 1",
-        "licensee" => "Rhomobile" }
-    end
-  end  
+  include_examples "ApiHelper"
+
+  it "should get license info" do
+    get "/rc/#{Rhoconnect::API_VERSION}/system/license", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    JSON.parse(last_response.body).should == {
+      "available" => 9,
+      "issued" => "Fri Apr 23 17:20:13 -0700 2010",
+      "seats" => 10,
+      "rhoconnect_version" => "Version 1",
+      "licensee" => "Rhomobile" }
+  end
 end

data/spec/api/system/login_spec.rb

@@ -1,43 +1,43 @@
 require File.join(File.dirname(__FILE__),'..','api_helper')
 
 describe "RhoconnectApiGetApiToken" do
-  it_should_behave_like "ApiHelper" do
-    it "should login and receive the token string" do
-      post "/rc/#{Rhoconnect::API_VERSION}/system/login", :login => 'rhoadmin',:password => ''
-      last_response.body.should == @api_token
-    end
-    
-    it "should login using the old route and show deprecation warning" do
-      post "/login", :login => 'rhoadmin',:password => ''
-      last_response.body.should == @api_token
-      last_response.headers["Warning"].index('deprecated').should_not == nil
-    end
-    
-    it "should fail to login and get token if user is not rhoadmin" do
-      Rhoconnect.appserver = nil
-      post "/rc/#{Rhoconnect::API_VERSION}/system/login", :login => @u_fields[:login],:password => 'testpass'
-      last_response.status.should == 422    
-      last_response.body.should == 'Invalid/missing API user'
-    end
+  include_examples "ApiHelper"
 
-    it "should return 422 if token doesn't belong to the API user" do
-      invalid_api_token = ApiToken.create({:value => 'mytoken', :user_id => 'notadmin'})
-      params = {:attributes => {:login => 'testuser1', :password => 'testpass1'}}
-      post "/rc/#{Rhoconnect::API_VERSION}/users", params, {Rhoconnect::API_TOKEN_HEADER => invalid_api_token.value}
-      last_response.status.should == 422
-      last_response.body.should == 'Invalid/missing API user'
-    end  
+  it "should login and receive the token string" do
+    post "/rc/#{Rhoconnect::API_VERSION}/system/login", :login => 'rhoadmin',:password => ''
+    last_response.body.should == @api_token
+  end
 
-    it "should return 422 if no token provided" do
-      params = {:attributes => {:login => 'testuser1', :password => 'testpass1'}}
-      post "/rc/#{Rhoconnect::API_VERSION}/users", params
-      last_response.status.should == 422
-    end
-    
-    it "response should have cache-control and pragma headers set to no-cache" do
-      post "/rc/#{Rhoconnect::API_VERSION}/system/login", :login => 'rhoadmin',:password => ''
-      last_response.headers['Cache-Control'].should == 'no-cache'
-      last_response.headers['Pragma'].should == 'no-cache'
-    end
-  end  
+  it "should login using the old route and show deprecation warning" do
+    post "/login", :login => 'rhoadmin',:password => ''
+    last_response.body.should == @api_token
+    last_response.headers["Warning"].index('deprecated').should_not == nil
+  end
+
+  it "should fail to login and get token if user is not rhoadmin" do
+    Rhoconnect.appserver = nil
+    post "/rc/#{Rhoconnect::API_VERSION}/system/login", :login => @u_fields[:login],:password => 'testpass'
+    last_response.status.should == 422
+    last_response.body.should == 'Invalid/missing API user'
+  end
+
+  it "should return 422 if token doesn't belong to the API user" do
+    invalid_api_token = ApiToken.create({:value => 'mytoken', :user_id => 'notadmin'})
+    params = {:attributes => {:login => 'testuser1', :password => 'testpass1'}}
+    post "/rc/#{Rhoconnect::API_VERSION}/users", params, {Rhoconnect::API_TOKEN_HEADER => invalid_api_token.value}
+    last_response.status.should == 422
+    last_response.body.should == 'Invalid/missing API user'
+  end
+
+  it "should return 422 if no token provided" do
+    params = {:attributes => {:login => 'testuser1', :password => 'testpass1'}}
+    post "/rc/#{Rhoconnect::API_VERSION}/users", params
+    last_response.status.should == 422
+  end
+
+  it "response should have cache-control and pragma headers set to no-cache" do
+    post "/rc/#{Rhoconnect::API_VERSION}/system/login", :login => 'rhoadmin',:password => ''
+    last_response.headers['Cache-Control'].should == 'no-cache'
+    last_response.headers['Pragma'].should == 'no-cache'
+  end
 end

data/spec/api/system/reset_spec.rb

@@ -1,21 +1,21 @@
 require File.join(File.dirname(__FILE__),'..','api_helper')
 
 describe "RhoconnectApiReset" do
-  it_should_behave_like "ApiHelper" do
-    it "should reset and re-create rhoadmin user with bootstrap" do
-      Store.put_data('somedoc',{ '1' => {'foo'=>'bar'}})
-      post "/rc/#{Rhoconnect::API_VERSION}/system/reset", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      App.is_exist?(test_app_name).should == true
-      Store.get_data('somedoc').should == {}
-      User.authenticate('rhoadmin','').should_not be_nil
-    end
+  include_examples "ApiHelper"
 
-    it "should reset and re-create rhoadmin user with initializer" do
-      Store.put_data('somedoc',{ '1' => {'foo'=>'bar'}})
-      post "/rc/#{Rhoconnect::API_VERSION}/system/reset", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      App.is_exist?(test_app_name).should == true
-      Store.get_data('somedoc').should == {}
-      User.authenticate('rhoadmin','').should_not be_nil
-    end
+  it "should reset and re-create rhoadmin user with bootstrap" do
+    Store.put_data('somedoc',{ '1' => {'foo'=>'bar'}})
+    post "/rc/#{Rhoconnect::API_VERSION}/system/reset", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    App.is_exist?(test_app_name).should == true
+    Store.get_data('somedoc').should == {}
+    User.authenticate('rhoadmin','').should_not be_nil
+  end
+
+  it "should reset and re-create rhoadmin user with initializer" do
+    Store.put_data('somedoc',{ '1' => {'foo'=>'bar'}})
+    post "/rc/#{Rhoconnect::API_VERSION}/system/reset", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    App.is_exist?(test_app_name).should == true
+    Store.get_data('somedoc').should == {}
+    User.authenticate('rhoadmin','').should_not be_nil
   end
 end

data/spec/api/system/stats_spec.rb

@@ -1,80 +1,79 @@
 require File.join(File.dirname(__FILE__),'..','api_helper')
 
 describe "RhoconnectApiStats" do
-  it_should_behave_like "ApiHelper" do
-    
-    def app
-      @app ||= Rack::URLMap.new Rhoconnect.url_map
-    end
-    
-    before(:each) do
-      Rhoconnect::Server.set :stats, true
-      Rhoconnect.stats = true
-    end
-    
-    after(:each) do
-      Rhoconnect::Server.set :stats, false
-      Rhoconnect.stats = false
-    end
+  include_examples "ApiHelper"
 
-    it "should retrieve metric names" do
-      Store.set_value('stat:foo', '1')
-      Store.set_value('stat:bar', '2')
-      get "/rc/#{Rhoconnect::API_VERSION}/system/stats", {
-        :api_token => @api_token, 
-        :names => '*'
-      }
-      last_response.should be_ok
-      JSON.parse(last_response.body).sort.should == ['bar', 'foo']
-    end
+  def app
+    @app ||= Rack::URLMap.new Rhoconnect.url_map
+  end
 
-    it "should retrieve range metric" do
-      Store.zadd('stat:foo', 2, "1:2")
-      Store.zadd('stat:foo', 3, "1:3")
-      get "/rc/#{Rhoconnect::API_VERSION}/system/stats", {
-        :metric => 'foo', 
-        :start => 0,
-        :finish => -1
-      }, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      JSON.parse(last_response.body).should == ["1:2", "1:3"]
-    end
+  before(:each) do
+    Rhoconnect::Server.set :stats, true
+    Rhoconnect.stats = true
+  end
 
-    it "should retrieve string metric" do
-      Store.put_value('stat:foo', 'bar')
-      get "/rc/#{Rhoconnect::API_VERSION}/system/stats", {
-        :metric => 'foo'
-      }, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      last_response.body.should == 'bar'
-    end
-    
-    it "should retrieve string metric with old route and print deprecation warning" do
-      Store.put_value('stat:foo', 'bar')
-      post "/api/stats", {
-        :metric => 'foo'
-      }, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      last_response.headers["Warning"].index('deprecated').should_not == nil
-      last_response.body.should == 'bar'
-    end
+  after(:each) do
+    Rhoconnect::Server.set :stats, false
+    Rhoconnect.stats = false
+  end
 
-    it "should raise error on unknown metric" do
-      get "/rc/#{Rhoconnect::API_VERSION}/system/stats", {
-        :metric => 'foo'
-      }, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.status.should == 404    
-      last_response.body.should == 'Unknown metric'
-    end
+  it "should retrieve metric names" do
+    Store.set_value('stat:foo', '1')
+    Store.set_value('stat:bar', '2')
+    get "/rc/#{Rhoconnect::API_VERSION}/system/stats", {
+      :api_token => @api_token,
+      :names => '*'
+    }
+    last_response.should be_ok
+    JSON.parse(last_response.body).sort.should == ['bar', 'foo']
+  end
 
-    it "should raise error if stats not enabled" do
-      Rhoconnect::Server.set :stats, false
-      Rhoconnect.stats = false
-      get "/rc/#{Rhoconnect::API_VERSION}/system/stats", {
-        :metric => 'foo'
-      }, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.status.should == 500    
-      last_response.body.should == 'Stats not enabled'
-    end
-  end  
+  it "should retrieve range metric" do
+    Store.zadd('stat:foo', 2, "1:2")
+    Store.zadd('stat:foo', 3, "1:3")
+    get "/rc/#{Rhoconnect::API_VERSION}/system/stats", {
+      :metric => 'foo',
+      :start => 0,
+      :finish => -1
+    }, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    JSON.parse(last_response.body).should == ["1:2", "1:3"]
+  end
+
+  it "should retrieve string metric" do
+    Store.put_value('stat:foo', 'bar')
+    get "/rc/#{Rhoconnect::API_VERSION}/system/stats", {
+      :metric => 'foo'
+    }, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    last_response.body.should == 'bar'
+  end
+
+  it "should retrieve string metric with old route and print deprecation warning" do
+    Store.put_value('stat:foo', 'bar')
+    post "/api/stats", {
+      :metric => 'foo'
+    }, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    last_response.headers["Warning"].index('deprecated').should_not == nil
+    last_response.body.should == 'bar'
+  end
+
+  it "should raise error on unknown metric" do
+    get "/rc/#{Rhoconnect::API_VERSION}/system/stats", {
+      :metric => 'foo'
+    }, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.status.should == 404
+    last_response.body.should == 'Unknown metric'
+  end
+
+  it "should raise error if stats not enabled" do
+    Rhoconnect::Server.set :stats, false
+    Rhoconnect.stats = false
+    get "/rc/#{Rhoconnect::API_VERSION}/system/stats", {
+      :metric => 'foo'
+    }, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.status.should == 500
+    last_response.body.should == 'Stats not enabled'
+  end
 end