rhoconnect 4.0.4 → 5.1.1

data/spec/api/user/create_user_spec.rb

@@ -1,41 +1,41 @@
 require File.join(File.dirname(__FILE__),'..','api_helper')
 
 describe "RhoconnectApiCreateUser" do
-  it_should_behave_like "ApiHelper" do
-    it "should create user" do
-      params = {:attributes => {:login => 'testuser1', :password => 'testpass1'}}
-      post "/rc/#{Rhoconnect::API_VERSION}/users", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      User.load(params[:attributes][:login]).login.should == params[:attributes][:login]
-      User.authenticate(params[:attributes][:login],
-        params[:attributes][:password]).login.should == params[:attributes][:login]
-      @a.users.members.sort.should == [@u.login, params[:attributes][:login]]
-    end
-    
-    it "should create user and post a deprecation warning with the old route" do
-      params = {:api_token => @api_token,
-        :attributes => {:login => 'testuser1', :password => 'testpass1'}}
-      post "/api/create_user", params
-      last_response.should be_ok
-      last_response.headers["Warning"].index('deprecated').should_not == nil
-      User.load(params[:attributes][:login]).login.should == params[:attributes][:login]
-      User.authenticate(params[:attributes][:login],
-        params[:attributes][:password]).login.should == params[:attributes][:login]
-      @a.users.members.sort.should == [@u.login, params[:attributes][:login]]
-    end
-    
-    it "should not create user without the api_token" do
-      params = {:attributes => {:login => 'testuser1', :password => 'testpass1'}}
-      post "/rc/#{Rhoconnect::API_VERSION}/users", params, {}
-      last_response.status.should == 422
-      User.is_exist?('testuser1').should == false
-    end
-      
-    it "should not create user with empty login" do
-      params = {:attributes => {:login => '', :password => ''}}
-      post "/rc/#{Rhoconnect::API_VERSION}/users", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should_not be_ok
-      User.is_exist?('').should == false
-    end
-  end 
+  include_examples "ApiHelper"
+
+  it "should create user" do
+    params = {:attributes => {:login => 'testuser1', :password => 'testpass1'}}
+    post "/rc/#{Rhoconnect::API_VERSION}/users", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    User.load(params[:attributes][:login]).login.should == params[:attributes][:login]
+    User.authenticate(params[:attributes][:login],
+      params[:attributes][:password]).login.should == params[:attributes][:login]
+    @a.users.members.sort.should == [@u.login, params[:attributes][:login]]
+  end
+
+  it "should create user and post a deprecation warning with the old route" do
+    params = {:api_token => @api_token,
+      :attributes => {:login => 'testuser1', :password => 'testpass1'}}
+    post "/api/create_user", params
+    last_response.should be_ok
+    last_response.headers["Warning"].index('deprecated').should_not == nil
+    User.load(params[:attributes][:login]).login.should == params[:attributes][:login]
+    User.authenticate(params[:attributes][:login],
+      params[:attributes][:password]).login.should == params[:attributes][:login]
+    @a.users.members.sort.should == [@u.login, params[:attributes][:login]]
+  end
+
+  it "should not create user without the api_token" do
+    params = {:attributes => {:login => 'testuser1', :password => 'testpass1'}}
+    post "/rc/#{Rhoconnect::API_VERSION}/users", params, {}
+    last_response.status.should == 422
+    User.is_exist?('testuser1').should == false
+  end
+
+  it "should not create user with empty login" do
+    params = {:attributes => {:login => '', :password => ''}}
+    post "/rc/#{Rhoconnect::API_VERSION}/users", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should_not be_ok
+    User.is_exist?('').should == false
+  end
 end

data/spec/api/user/delete_client_spec.rb

@@ -1,12 +1,12 @@
 require File.join(File.dirname(__FILE__),'..','api_helper')
 
 describe "RhoconnectApiDeleteClient" do
-  it_should_behave_like "ApiHelper" do  
-    it "should delete client for the user" do
-      delete "/rc/#{Rhoconnect::API_VERSION}/users/#{@u_fields[:login]}/clients/#{@c.id}", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      Client.is_exist?(@c.id).should == false
-      User.load(@u_fields[:login]).clients.members.should == []
-    end
+  include_examples "ApiHelper"
+
+  it "should delete client for the user" do
+    delete "/rc/#{Rhoconnect::API_VERSION}/users/#{@u_fields[:login]}/clients/#{@c.id}", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    Client.is_exist?(@c.id).should == false
+    User.load(@u_fields[:login]).clients.members.should == []
   end
 end

data/spec/api/user/delete_user_spec.rb

@@ -1,67 +1,67 @@
 require File.join(File.dirname(__FILE__),'..','api_helper')
 
 describe "RhoconnectApiDeleteUser" do
-  it_should_behave_like "ApiHelper" do
-    it "should delete user" do
-      params = {:attributes => {:login => 'testuser1', :password => 'testpass1'}}
-      post "/rc/#{Rhoconnect::API_VERSION}/users", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      User.is_exist?(params[:attributes][:login]).should == true
-      
-      #set up two users with data for the same source
-      params2 = {:app_id => APP_NAME,:user_id => 'testuser1'}
-      params3 = {:app_id => APP_NAME,:user_id => 'testuser'}
-      time = Time.now.to_i
-      s  = Source.load('SampleAdapter', params2)
-      s.read_state.refresh_time = time
-      s2 = Source.load('SampleAdapter', params3)
-      s2.read_state.refresh_time = time
-      Source.define_valid_doctypes([:doc1])
-      set_doc_state(s, :doc1 => {'4'=>@product4})
-      set_doc_state(s2, :doc1 => {'4'=>@product4})
-      verify_doc_result(s, :doc1 => {'4'=>@product4})
-      verify_doc_result(s2, :doc1 => {'4'=>@product4})
-      
-      delete "/rc/#{Rhoconnect::API_VERSION}/users/#{params[:attributes][:login]}", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}  
-      last_response.should be_ok
-      verify_doc_result(s, :doc1 => {})
-      verify_doc_result(s2, :doc1 => {'4'=>@product4})
-      s.load_read_state.should == nil
-      s2.load_read_state.refresh_time.should == time
-      User.is_exist?(params[:attributes][:login]).should == false
-      App.load(test_app_name).users.members.should == ["testuser"]
-      Source.valid_doctypes.delete(:doc1)
-    end
-    
-    it "should delete user and print deprecation warning with the old route" do
-      params = {:attributes => {:login => 'testuser1', :password => 'testpass1'}}
-      post "/rc/#{Rhoconnect::API_VERSION}/users", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      User.is_exist?(params[:attributes][:login]).should == true
-    
-      #set up two users with data for the same source
-      params2 = {:app_id => APP_NAME,:user_id => 'testuser1'}
-      params3 = {:app_id => APP_NAME,:user_id => 'testuser'}
-      time = Time.now.to_i
-      s  = Source.load('SampleAdapter', params2)
-      s.read_state.refresh_time = time
-      s2 = Source.load('SampleAdapter', params3)
-      s2.read_state.refresh_time = time
-      Source.define_valid_doctypes([:doc1])
-      set_state(s.docname(:doc1) => {'4'=>@product4})
-      set_state(s2.docname(:doc1) => {'4'=>@product4})
-      verify_result(s.docname(:doc1) => {'4'=>@product4})
-      verify_result(s2.docname(:doc1) => {'4'=>@product4})
-      post "/api/delete_user", {:api_token => @api_token, :user_id => params[:attributes][:login]}
-      last_response.should be_ok
-      last_response.headers['Warning'].index('deprecated').should_not == nil
-      verify_result(s.docname(:doc1) => {})
-      verify_result(s2.docname(:doc1) => {'4'=>@product4})
-      s.load_read_state.should == nil
-      s2.load_read_state.refresh_time.should == time
-      User.is_exist?(params[:attributes][:login]).should == false
-      App.load(test_app_name).users.members.should == ["testuser"]
-      Source.valid_doctypes.delete(:doc1)
-    end
+  include_examples "ApiHelper"
+
+  it "should delete user" do
+    params = {:attributes => {:login => 'testuser1', :password => 'testpass1'}}
+    post "/rc/#{Rhoconnect::API_VERSION}/users", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    User.is_exist?(params[:attributes][:login]).should == true
+
+    #set up two users with data for the same source
+    params2 = {:app_id => APP_NAME,:user_id => 'testuser1'}
+    params3 = {:app_id => APP_NAME,:user_id => 'testuser'}
+    time = Time.now.to_i
+    s  = Source.load('SampleAdapter', params2)
+    s.read_state.refresh_time = time
+    s2 = Source.load('SampleAdapter', params3)
+    s2.read_state.refresh_time = time
+    Source.define_valid_doctypes([:doc1])
+    set_doc_state(s, :doc1 => {'4'=>@product4})
+    set_doc_state(s2, :doc1 => {'4'=>@product4})
+    verify_doc_result(s, :doc1 => {'4'=>@product4})
+    verify_doc_result(s2, :doc1 => {'4'=>@product4})
+
+    delete "/rc/#{Rhoconnect::API_VERSION}/users/#{params[:attributes][:login]}", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    verify_doc_result(s, :doc1 => {})
+    verify_doc_result(s2, :doc1 => {'4'=>@product4})
+    s.load_read_state.should == nil
+    s2.load_read_state.refresh_time.should == time
+    User.is_exist?(params[:attributes][:login]).should == false
+    App.load(test_app_name).users.members.should == ["testuser"]
+    Source.valid_doctypes.delete(:doc1)
+  end
+
+  it "should delete user and print deprecation warning with the old route" do
+    params = {:attributes => {:login => 'testuser1', :password => 'testpass1'}}
+    post "/rc/#{Rhoconnect::API_VERSION}/users", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    User.is_exist?(params[:attributes][:login]).should == true
+
+    #set up two users with data for the same source
+    params2 = {:app_id => APP_NAME,:user_id => 'testuser1'}
+    params3 = {:app_id => APP_NAME,:user_id => 'testuser'}
+    time = Time.now.to_i
+    s  = Source.load('SampleAdapter', params2)
+    s.read_state.refresh_time = time
+    s2 = Source.load('SampleAdapter', params3)
+    s2.read_state.refresh_time = time
+    Source.define_valid_doctypes([:doc1])
+    set_state(s.docname(:doc1) => {'4'=>@product4})
+    set_state(s2.docname(:doc1) => {'4'=>@product4})
+    verify_result(s.docname(:doc1) => {'4'=>@product4})
+    verify_result(s2.docname(:doc1) => {'4'=>@product4})
+    post "/api/delete_user", {:api_token => @api_token, :user_id => params[:attributes][:login]}
+    last_response.should be_ok
+    last_response.headers['Warning'].index('deprecated').should_not == nil
+    verify_result(s.docname(:doc1) => {})
+    verify_result(s2.docname(:doc1) => {'4'=>@product4})
+    s.load_read_state.should == nil
+    s2.load_read_state.refresh_time.should == time
+    User.is_exist?(params[:attributes][:login]).should == false
+    App.load(test_app_name).users.members.should == ["testuser"]
+    Source.valid_doctypes.delete(:doc1)
   end
 end

data/spec/api/user/list_clients_spec.rb

@@ -1,30 +1,30 @@
 require File.join(File.dirname(__FILE__),'..','api_helper')
 
 describe "RhoconnectApiListUserClients" do
-  it_should_behave_like "ApiHelper" do
-    it "should list user's clients" do
-      get "/rc/#{Rhoconnect::API_VERSION}/users/#{@u_fields[:login]}/clients", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      res = JSON.parse(last_response.body)
-      res.is_a?(Array).should == true
-      res.size.should == 1
-      res[0].is_a?(String) == true
-      res[0].length.should == 32
-    end
-    
-    it "should list user's clients with old route and show deprecation warning" do
-      post "/api/list_clients", {:api_token => @api_token,
-        :user_id => @u_fields[:login]}
-      res = JSON.parse(last_response.body)
-      res.is_a?(Array).should == true
-      res.size.should == 1
-      res[0].is_a?(String) == true
-      res[0].length.should == 32
-    end
+  include_examples "ApiHelper"
 
-    it "should handle empty client's list" do
-      @u.clients.delete(@c.id)
-      get "/rc/#{Rhoconnect::API_VERSION}/users/#{@u_fields[:login]}/clients", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      JSON.parse(last_response.body).should == []    
-    end
+  it "should list user's clients" do
+    get "/rc/#{Rhoconnect::API_VERSION}/users/#{@u_fields[:login]}/clients", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    res = JSON.parse(last_response.body)
+    res.is_a?(Array).should == true
+    res.size.should == 1
+    res[0].is_a?(String) == true
+    res[0].length.should == 32
+  end
+
+  it "should list user's clients with old route and show deprecation warning" do
+    post "/api/list_clients", {:api_token => @api_token,
+      :user_id => @u_fields[:login]}
+    res = JSON.parse(last_response.body)
+    res.is_a?(Array).should == true
+    res.size.should == 1
+    res[0].is_a?(String) == true
+    res[0].length.should == 32
+  end
+
+  it "should handle empty client's list" do
+    @u.clients.delete(@c.id)
+    get "/rc/#{Rhoconnect::API_VERSION}/users/#{@u_fields[:login]}/clients", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    JSON.parse(last_response.body).should == []
   end
 end

data/spec/api/user/list_source_docs_spec.rb

@@ -1,35 +1,35 @@
 require File.join(File.dirname(__FILE__),'..','api_helper')
 
 describe "RhoconnectApiListSourceDocs" do
-  it_should_behave_like "ApiHelper" do
-    it "should list of shared source documents" do
-      sourcename = "SimpleAdapter"
-      user_id = '*'
-      get "/rc/#{Rhoconnect::API_VERSION}/users/#{user_id}/sources/#{sourcename}/docnames", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      JSON.parse(last_response.body).should == {
-        "md"=>"source:application:__shared__:SimpleAdapter:md", 
-        "errors"=>"source:application:__shared__:SimpleAdapter:errors", 
-        "md_size"=>"source:application:__shared__:SimpleAdapter:md_size", 
-        "md_copy"=>"source:application:__shared__:SimpleAdapter:md_copy"}
-    end
-    
-    it "should list of shared source documents with old route and deprecation warning" do
-      post "/api/list_source_docs", {:source_id => "SimpleAdapter", :user_id => '*'}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      JSON.parse(last_response.body).should == {
-        "md"=>"source:application:__shared__:SimpleAdapter:md", 
-        "errors"=>"source:application:__shared__:SimpleAdapter:errors", 
-        "md_size"=>"source:application:__shared__:SimpleAdapter:md_size", 
-        "md_copy"=>"source:application:__shared__:SimpleAdapter:md_copy"}
-    end
+  include_examples "ApiHelper"
 
-    it "should list user source documents" do
-      sourcename = "SampleAdapter"
-      get "/rc/#{Rhoconnect::API_VERSION}/users/#{@u.id}/sources/#{sourcename}/docnames", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      JSON.parse(last_response.body).should == {
-        "md"=>"source:application:testuser:SampleAdapter:md", 
-        "errors"=>"source:application:testuser:SampleAdapter:errors", 
-        "md_size"=>"source:application:testuser:SampleAdapter:md_size", 
-        "md_copy"=>"source:application:testuser:SampleAdapter:md_copy"}
-    end
+  it "should list of shared source documents" do
+    sourcename = "SimpleAdapter"
+    user_id = '*'
+    get "/rc/#{Rhoconnect::API_VERSION}/users/#{user_id}/sources/#{sourcename}/docnames", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    JSON.parse(last_response.body).should == {
+      "md"=>"source:application:__shared__:SimpleAdapter:md",
+      "errors"=>"source:application:__shared__:SimpleAdapter:errors",
+      "md_size"=>"source:application:__shared__:SimpleAdapter:md_size",
+      "md_copy"=>"source:application:__shared__:SimpleAdapter:md_copy"}
+  end
+
+  it "should list of shared source documents with old route and deprecation warning" do
+    post "/api/list_source_docs", {:source_id => "SimpleAdapter", :user_id => '*'}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    JSON.parse(last_response.body).should == {
+      "md"=>"source:application:__shared__:SimpleAdapter:md",
+      "errors"=>"source:application:__shared__:SimpleAdapter:errors",
+      "md_size"=>"source:application:__shared__:SimpleAdapter:md_size",
+      "md_copy"=>"source:application:__shared__:SimpleAdapter:md_copy"}
+  end
+
+  it "should list user source documents" do
+    sourcename = "SampleAdapter"
+    get "/rc/#{Rhoconnect::API_VERSION}/users/#{@u.id}/sources/#{sourcename}/docnames", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    JSON.parse(last_response.body).should == {
+      "md"=>"source:application:testuser:SampleAdapter:md",
+      "errors"=>"source:application:testuser:SampleAdapter:errors",
+      "md_size"=>"source:application:testuser:SampleAdapter:md_size",
+      "md_copy"=>"source:application:testuser:SampleAdapter:md_copy"}
   end
 end

data/spec/api/user/list_users_spec.rb

@@ -1,28 +1,28 @@
 require File.join(File.dirname(__FILE__),'..','api_helper')
 
 describe "RhoconnectApiListUsers" do
-  it_should_behave_like "ApiHelper" do
-    it "should list users" do
-      params = {:attributes => {:login => 'testuser1', :password => 'testpass1'}}
-      post "/rc/#{Rhoconnect::API_VERSION}/users", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      get "/rc/#{Rhoconnect::API_VERSION}/users", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      JSON.parse(last_response.body).sort.should == ["testuser", "testuser1"].sort
-    end
+  include_examples "ApiHelper"
 
-    it "should handle empty user's list" do
-      @a.delete; @a = App.create(@a_fields)
-      get "/rc/#{Rhoconnect::API_VERSION}/users", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      JSON.parse(last_response.body).should == []    
-    end
-  
-    it "should show the deprecation warning on /api/list_users" do
-      params = {:attributes => {:login => 'testuser1', :password => 'testpass1'}}
-      post "/rc/#{Rhoconnect::API_VERSION}/users", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      post "/api/list_users", {:api_token => @api_token}
-      JSON.parse(last_response.body).sort.should == ["testuser", "testuser1"].sort
-      last_response.headers['Warning'].index('deprecated').should_not == nil
-    end
+  it "should list users" do
+    params = {:attributes => {:login => 'testuser1', :password => 'testpass1'}}
+    post "/rc/#{Rhoconnect::API_VERSION}/users", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    get "/rc/#{Rhoconnect::API_VERSION}/users", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    JSON.parse(last_response.body).sort.should == ["testuser", "testuser1"].sort
+  end
+
+  it "should handle empty user's list" do
+    @a.delete; @a = App.create(@a_fields)
+    get "/rc/#{Rhoconnect::API_VERSION}/users", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    JSON.parse(last_response.body).should == []
+  end
+
+  it "should show the deprecation warning on /api/list_users" do
+    params = {:attributes => {:login => 'testuser1', :password => 'testpass1'}}
+    post "/rc/#{Rhoconnect::API_VERSION}/users", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    post "/api/list_users", {:api_token => @api_token}
+    JSON.parse(last_response.body).sort.should == ["testuser", "testuser1"].sort
+    last_response.headers['Warning'].index('deprecated').should_not == nil
   end
 end

data/spec/api/user/ping_spec.rb

@@ -1,24 +1,24 @@
 require File.join(File.dirname(__FILE__),'..','api_helper')
 
 describe "RhoconnectApiPing" do
-  it_should_behave_like "ApiHelper" do
-    it "should do ping synchronously" do
-      params = {"user_id" => @u.id, "sources" => [@s.name], "message" => 'hello world', 
-        "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3'}
-      PingJob.should respond_to :perform
-      PingJob.should_receive(:perform).once.with(params)
-      post "/rc/#{Rhoconnect::API_VERSION}/users/ping", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-    end
+  include_examples "ApiHelper"
 
-    it "should do ping asynchronously" do
-      params = {"user_id" => @u.id, "async" => "true","sources" => [@s.name], "message" => 'hello world', 
-        "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3'}
+  it "should do ping synchronously" do
+    params = {"user_id" => @u.id, "sources" => [@s.name], "message" => 'hello world',
+      "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3'}
+    PingJob.should respond_to :perform
+    PingJob.should_receive(:perform).once.with(params)
+    post "/rc/#{Rhoconnect::API_VERSION}/users/ping", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+  end
 
-      PingJob.should respond_to :enqueue
-      PingJob.should_receive(:enqueue).once.with(params)
-      post "/rc/#{Rhoconnect::API_VERSION}/users/ping", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-    end
-  end  
+  it "should do ping asynchronously" do
+    params = {"user_id" => @u.id, "async" => "true","sources" => [@s.name], "message" => 'hello world',
+      "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3'}
+
+    PingJob.should respond_to :enqueue
+    PingJob.should_receive(:enqueue).once.with(params)
+    post "/rc/#{Rhoconnect::API_VERSION}/users/ping", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+  end
 end

data/spec/api/user/show_user_spec.rb

@@ -1,14 +1,14 @@
 require File.join(File.dirname(__FILE__),'..','api_helper')
 
 describe "RhoconnectApiShowUser" do
-  it_should_behave_like "ApiHelper" do
-    it "should show user" do
-      params = {:attributes => {:login => 'testuser1', :password => 'testpass1'}}
-      post "/rc/#{Rhoconnect::API_VERSION}/users", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      get "/rc/#{Rhoconnect::API_VERSION}/users/#{params[:attributes][:login]}", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      JSON.parse(last_response.body).should include({"name"=>"login", "value"=>"testuser1", "type"=>"string"}) 
-    end
-  end  
+  include_examples "ApiHelper"
+
+  it "should show user" do
+    params = {:attributes => {:login => 'testuser1', :password => 'testpass1'}}
+    post "/rc/#{Rhoconnect::API_VERSION}/users", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    get "/rc/#{Rhoconnect::API_VERSION}/users/#{params[:attributes][:login]}", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    JSON.parse(last_response.body).should include({"name"=>"login", "value"=>"testuser1", "type"=>"string"})
+  end
 end

data/spec/api/user/update_user_spec.rb

@@ -1,50 +1,50 @@
 require File.join(File.dirname(__FILE__),'..','api_helper')
 
 describe "RhoconnectApiUpdateUser" do
-  it_should_behave_like "ApiHelper" do
-    it "should update user successfully" do
-      login = 'rhoadmin'
-      put "/rc/#{Rhoconnect::API_VERSION}/users/#{login}", {:attributes => {:new_password => '123'}}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      user = User.authenticate('rhoadmin','123')
-      user.login.should == 'rhoadmin'
-      user.admin.should == 1
-    end
-    
-    it "should update user successfully with old route and print deprecation warning" do
-      login = 'rhoadmin'
-      post "/api/update_user", {:api_token => @api_token, :user_id => login,
-        :attributes => {:new_password => '123'}}
-      last_response.should be_ok
-      user = User.authenticate('rhoadmin','123')
-      user.login.should == 'rhoadmin'
-      user.admin.should == 1
-    end
+  include_examples "ApiHelper"
 
-    it "should fail to update user with wrong attributes" do
-      params = {:attributes => {:login => 'testuser1', :password => 'testpass1'}}
-      post "/rc/#{Rhoconnect::API_VERSION}/users", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      User.is_exist?(params[:attributes][:login]).should == true
-      
-      put "/rc/#{Rhoconnect::API_VERSION}/users/#{params[:attributes][:login]}", {:attributes => {:missingattrib => '123'}}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.status.should == 500
-      last_response.body.match('undefined method').should_not be_nil
-    end
+  it "should update user successfully" do
+    login = 'rhoadmin'
+    put "/rc/#{Rhoconnect::API_VERSION}/users/#{login}", {:attributes => {:new_password => '123'}}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    user = User.authenticate('rhoadmin','123')
+    user.login.should == 'rhoadmin'
+    user.admin.should == 1
+  end
+
+  it "should update user successfully with old route and print deprecation warning" do
+    login = 'rhoadmin'
+    post "/api/update_user", {:api_token => @api_token, :user_id => login,
+      :attributes => {:new_password => '123'}}
+    last_response.should be_ok
+    user = User.authenticate('rhoadmin','123')
+    user.login.should == 'rhoadmin'
+    user.admin.should == 1
+  end
+
+  it "should fail to update user with wrong attributes" do
+    params = {:attributes => {:login => 'testuser1', :password => 'testpass1'}}
+    post "/rc/#{Rhoconnect::API_VERSION}/users", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    User.is_exist?(params[:attributes][:login]).should == true
+
+    put "/rc/#{Rhoconnect::API_VERSION}/users/#{params[:attributes][:login]}", {:attributes => {:missingattrib => '123'}}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.status.should == 500
+    last_response.body.match('undefined method').should_not be_nil
+  end
+
+  it "should not update login attribute for user" do
+    params = {:attributes => {:login => 'testuser1', :password => 'testpass1'}}
+    post "/rc/#{Rhoconnect::API_VERSION}/users", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    User.is_exist?(params[:attributes][:login]).should == true
 
-    it "should not update login attribute for user" do
-      params = {:attributes => {:login => 'testuser1', :password => 'testpass1'}}
-      post "/rc/#{Rhoconnect::API_VERSION}/users", params, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      User.is_exist?(params[:attributes][:login]).should == true
-      
-      put "/rc/#{Rhoconnect::API_VERSION}/users/#{params[:attributes][:login]}", 
-        {:attributes => {:new_password => '123', :login => 'someotheruser1'}}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      user = User.authenticate('testuser1','123')
-      user.login.should == 'testuser1'
-      user.admin.should_not == 1
-      User.is_exist?('someotheruser1').should == false
-    end
+    put "/rc/#{Rhoconnect::API_VERSION}/users/#{params[:attributes][:login]}",
+      {:attributes => {:new_password => '123', :login => 'someotheruser1'}}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    user = User.authenticate('testuser1','123')
+    user.login.should == 'testuser1'
+    user.admin.should_not == 1
+    User.is_exist?('someotheruser1').should == false
   end
 end

data/spec/api/user/user_get_db_doc_spec.rb

@@ -1,16 +1,16 @@
 require File.join(File.dirname(__FILE__),'..','api_helper')
 
 describe "RhoconnectApiUserGetDbDoc" do
-  it_should_behave_like "ApiHelper" do
-    it "should get user's db document by doc key and data" do
-      data = {'1' => {'foo' => 'bar'}}
-      dockey = 'myuserdoc'
-      post "/rc/#{Rhoconnect::API_VERSION}/users/#{@u.id}/sources/#{@s2.name}/docs/#{dockey}", {:data => data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      
-      get "/rc/#{Rhoconnect::API_VERSION}/users/#{@u.id}/sources/#{@s2.name}/docs/#{dockey}", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-      last_response.should be_ok
-      JSON.parse(last_response.body).should == data
-    end
-  end  
+  include_examples "ApiHelper"
+
+  it "should get user's db document by doc key and data" do
+    data = {'1' => {'foo' => 'bar'}}
+    dockey = 'myuserdoc'
+    post "/rc/#{Rhoconnect::API_VERSION}/users/#{@u.id}/sources/#{@s2.name}/docs/#{dockey}", {:data => data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+
+    get "/rc/#{Rhoconnect::API_VERSION}/users/#{@u.id}/sources/#{@s2.name}/docs/#{dockey}", {}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+    last_response.should be_ok
+    JSON.parse(last_response.body).should == data
+  end
 end