cf-uaac 3.5.0 → 3.6.0

data/spec/client_reg_spec.rb

@@ -23,88 +23,89 @@ describe ClientCli do
   before :all do
     #Util.default_logger(:trace)
     @output = StringIO.new
-    Cli.configure("", nil, @output, true)
-    setup_target(authorities: "scim.read,clients.secret", grant_types: "client_credentials")
-    @test_user, @test_pwd = "sam_#{Time.now.to_i}", "correcthorsebatterystaple"
+    Cli.configure('', nil, @output, true)
+    setup_target(authorities: 'scim.read,clients.secret', grant_types: 'client_credentials')
+    @test_user, @test_pwd = "sam_#{Time.now.to_i}", 'correcthorsebatterystaple'
   end
 
   after :all do cleanup_target end
 
-  it "registers a new client" do
+  it 'registers a new client' do
     @test_client.should be # actually registered in the before :all block
   end
 
-  it "gets a client registration" do
+  it 'gets a client registration' do
     Cli.run("client get #{@test_client}").should be
     Cli.output.string.should include @test_client
+    Cli.output.string.should include 'created_by'
   end
 
-  it "lists client registrations" do
-    Cli.run("clients").should be
+  it 'lists client registrations' do
+    Cli.run('clients').should be
     Cli.output.string.should include @admin_client, @test_client
   end
 
-  context "as test client" do
+  context 'as test client' do
 
     before :all do
       Cli.run("token client get #{@test_client} -s #{@test_secret}").should be
     end
 
-    it "logs in as test client" do
-      Cli.run("context").should be # login was in before :all block
+    it 'logs in as test client' do
+      Cli.run('context').should be # login was in before :all block
       Cli.output.string.should include @test_client
       Cli.output.string.should match /access_token: \S+?\s+token_type/m
     end
 
-    it "does not wrap the output of the access token in the terminal" do
+    it 'does not wrap the output of the access token in the terminal' do
       @output.stub(:tty?) { true }
       HighLine::SystemExtensions.stub(:terminal_size) { [80] }
-      Cli.run("context").should be
+      Cli.run('context').should be
       Cli.output.string.should match /access_token: \S+?\s+token_type/m
     end
 
     it "changes it's client secret" do
       Cli.run("token client get #{@test_client} -s #{@test_secret}").should be
-      Cli.run("token decode").should be
+      Cli.run('token decode').should be
       Cli.run("secret change --old_secret #{@test_secret} --secret newclientsecret").should be
       Cli.run("token client get #{@test_client} -s newclientsecret").should be
       Cli.run("secret change --old_secret newclientsecret -s #{@test_secret}").should be
       Cli.run("token client get #{@test_client} -s #{@test_secret}").should be
     end
 
-    it "fails to create a user account as test client" do
+    it 'fails to create a user account as test client' do
       Cli.run("user add #{@test_user} -p #{@test_pwd}").should be_nil
-      Cli.output.string.should include "access_denied"
+      Cli.output.string.should include 'access_denied'
     end
 
-    context "as updated client" do
+    context 'as updated client' do
 
       before :all do
         # update the test client as the admin client
         Cli.run("token client get #{@test_client} -s #{@test_secret}").should be
         Cli.run("context #{@admin_client}").should be
         Cli.run("client update #{@test_client} --authorities scim.write,scim.read").should be
+        Cli.output.string.should include 'created_by'
         Cli.run("client get #{@test_client}").should be
-        Cli.output.string.should include "scim.read", "scim.write"
+        Cli.output.string.should include 'scim.read', 'scim.write'
       end
 
-      it "fails to create a user account with old token" do
+      it 'fails to create a user account with old token' do
         Cli.run("context #{@test_client}").should be
         Cli.run("user add #{@test_user} -p #{@test_pwd}").should be_nil
-        Cli.output.string.should include "access_denied"
+        Cli.output.string.should include 'access_denied'
       end
 
-      it "creates a user account with a new token" do
+      it 'creates a user account with a new token' do
         Cli.run("context #{@test_client}").should be
         Cli.run("token client get #{@test_client} -s #{@test_secret}").should be
-        Cli.run("token decode")
+        Cli.run('token decode')
         Cli.run("user add #{@test_user.capitalize} -p #{@test_pwd} --email #{@test_user}@example.com --family_name #{@test_user.capitalize} --given_name joe").should be
-        Cli.output.string.should_not include "access_denied"
+        Cli.output.string.should_not include 'access_denied'
         Cli.run("user get #{@test_user}").should be
         Cli.output.string.should include @test_user.capitalize
       end
     end
-
   end
 
 #  context "as admin client" do
@@ -118,5 +119,4 @@ describe ClientCli do
 #  end
 
 end
-
 end

data/spec/spec_helper.rb

@@ -75,6 +75,7 @@ module SpecHelper
         "--authorized_grant_types #{opts[:grant_types]} " +
         "--autoapprove #{opts[:autoapprove]} " +
         "--signup_redirect_url #{opts[:signup_redirect_url]}").should be
+    Cli.output.string.should include 'created_by'
     opts.each { |k, a| Util.arglist(a).each {|v| Cli.output.string.should include(v) }}
     @test_client = test_client
   end

data/spec/user_spec.rb

@@ -22,15 +22,15 @@ describe UserCli do
 
   before :all do
     #Util.default_logger(:trace)
-    Cli.configure("", nil, StringIO.new, true)
-    setup_target(authorities: "clients.read,scim.read,scim.write")
+    Cli.configure('', nil, StringIO.new, true)
+    setup_target(authorities: 'clients.read,scim.read,scim.write')
     Cli.run("token client get #{@test_client} -s #{@test_secret}").should be
-    Config.yaml.should include("access_token")
-    @test_pwd = "TesTpwd$%^"
+    Config.yaml.should include('access_token')
+    @test_pwd = 'TesTpwd$%^'
     @test_user = "tEst_UseR_#{Time.now.to_i}"
     Cli.run("user add #{@test_user} -p #{@test_pwd} " +
-        "--emails sam@example.com,joNES@sample.com --given_name SamueL " +
-        "--phones 801-555-1212 --family_name jonES").should be
+      '--emails sam@example.com,joNES@sample.com --given_name SamueL ' +
+      '--phones 801-555-1212 --family_name jonES').should be
   end
 
   after :all do
@@ -38,12 +38,12 @@ describe UserCli do
     cleanup_target
   end
 
-  it "creates a user" do
-    Cli.output.string.should include "success"
+  it 'creates a user' do
+    Cli.output.string.should include 'success'
   end
 
   it "fails to change a user's password with the wrong old pwd" do
-    Cli.run("password change -p newpwd --old_password not-the-password").should be_nil
+    Cli.run('password change -p newpwd --old_password not-the-password').should be_nil
   end
 
   it "changes a user's password" do
@@ -52,25 +52,39 @@ describe UserCli do
     Cli.run("token get #{@test_user} newpwd").should be
     Cli.run("password change -p #{@test_pwd} -o newpwd").should be
     Cli.run("token get #{@test_user} #{@test_pwd}").should be
-    Cli.output.string.should include "Successfully fetched token"
+    Cli.output.string.should include 'Successfully fetched token'
   end
 
-  it "preserves case in names" do
+  it 'preserves case in names' do
     Cli.run("context #{@test_client}")
     Cli.run("user get #{@test_user.upcase}").should be
     Cli.output.string.should =~ /#{@test_user}/
   end
 
-  it "unlocks a user" do
-    Cli.run("user add user-1 -p password-1 " +
-                "--emails user-1@example.com --given_name user1 " +
-                "--phones 801-555-2431 --family_name jonES")
-    Cli.run("user unlock user-1")
-    Cli.output.string.should include "success"
-    Cli.run("user delete user-1")
+  it 'unlocks a user' do
+    Cli.run('user add user-1 -p password-1 ' +
+      '--emails user-1@example.com --given_name user1 ' +
+      '--phones 801-555-2431 --family_name jonES')
+    Cli.run('user unlock user-1')
+    Cli.output.string.should include 'success'
+    Cli.run('user delete user-1')
   end
 
-  describe "get list of users" do
+  it 'deactivates a user' do
+    Cli.run("user deactivate #{@test_user}")
+    Cli.output.string.should include 'user account successfully deactivated'
+    Cli.run("user get #{@test_user}")
+    Cli.output.string.should include 'active: false'
+  end
+
+  it 'activates a user' do
+    Cli.run("user activate #{@test_user}")
+    Cli.output.string.should include 'user account successfully activated'
+    Cli.run("user get #{@test_user}")
+    Cli.output.string.should include 'active: true'
+  end
+
+  describe 'get list of users' do
     before :all do
       i = 1
       count = 15
@@ -91,20 +105,20 @@ describe UserCli do
       end
     end
 
-    it "gets users with default pagination" do
-      Cli.run("users")
-      Cli.output.string.should include "user-1"
-      Cli.output.string.should include "user-2"
-      Cli.output.string.should include "user-14"
+    it 'gets users with default pagination' do
+      Cli.run('users')
+      Cli.output.string.should include 'user-1'
+      Cli.output.string.should include 'user-2'
+      Cli.output.string.should include 'user-14'
       # Default page size for stub uaa is 15
-      Cli.output.string.should_not include "user-15"
+      Cli.output.string.should_not include 'user-15'
     end
 
-    it "gets count users with pagination" do
-      Cli.run("users --start 1 --count 3")
-      Cli.output.string.should include "user-1"
-      Cli.output.string.should include "user-2"
-      Cli.output.string.should_not include "user-3"
+    it 'gets count users with pagination' do
+      Cli.run('users --start 1 --count 3')
+      Cli.output.string.should include 'user-1'
+      Cli.output.string.should include 'user-2'
+      Cli.output.string.should_not include 'user-3'
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cf-uaac
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.6.0
 platform: ruby
 authors:
 - Dave Syer
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-20 00:00:00.000000000 Z
+date: 2017-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,14 +104,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.7.0
+        version: 3.8.0
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement