hammer_cli_foreman 0.1.0 → 0.1.1

data/test/unit/media_test.rb

@@ -3,11 +3,7 @@ require File.join(File.dirname(__FILE__), 'apipie_resource_mock')
 
 describe HammerCLIForeman::Medium do
 
-  extend CommandTestHelper
-
-  before :each do
-    cmd.stubs(:name_to_id).returns(1)
-  end
+  include CommandTestHelper
 
   context "ListCommand" do
 
@@ -36,7 +32,7 @@ describe HammerCLIForeman::Medium do
     context "parameters" do
       it_should_accept "id", ["--id=1"]
       it_should_accept "name", ["--name=medium_x"]
-      it_should_fail_with "no arguments"
+      # it_should_fail_with "no arguments" # TODO: temporarily disabled, parameters are checked in the id resolver
     end
 
     context "output" do
@@ -46,7 +42,7 @@ describe HammerCLIForeman::Medium do
         it_should_print_column "Id"
         it_should_print_column "Path"
         it_should_print_column "OS Family"
-        it_should_print_column "OS IDs"
+        it_should_print_column "Operating systems"
         it_should_print_column "Created at"
         it_should_print_column "Updated at"
       end
@@ -59,8 +55,9 @@ describe HammerCLIForeman::Medium do
 
     context "parameters" do
       it_should_accept "name, path, os ids", ["--name=media", "--path=http://some.path/abc/$major/Fedora/$arch/", "--operatingsystem-ids=1,2"]
-      it_should_fail_with "name missing", ["--path=http://some.path/abc/$major/Fedora/$arch/"]
-      it_should_fail_with "path missing", ["--name=media"]
+      # it_should_fail_with "name missing", ["--path=http://some.path/abc/$major/Fedora/$arch/"]
+      # it_should_fail_with "path missing", ["--name=media"]
+      # TODO: temporarily disabled, parameters are checked in the api
     end
 
     with_params ["--name=medium_x", "--path=http://some.path/", "--operatingsystem-ids=1,2"] do
@@ -75,7 +72,7 @@ describe HammerCLIForeman::Medium do
     context "parameters" do
       it_should_accept "name", ["--name=media"]
       it_should_accept "id", ["--id=1"]
-      it_should_fail_with "name or id missing", []
+      # it_should_fail_with "name or id missing", [] # TODO: temporarily disabled, parameters are checked in the id resolver
     end
   end
 
@@ -87,12 +84,13 @@ describe HammerCLIForeman::Medium do
       it_should_accept "name", ["--name=medium"]
       it_should_accept "id", ["--id=1"]
       it_should_accept "os ids", ["--id=1", "--operatingsystem-ids=1,2"]
-      it_should_fail_with "no params", []
-      it_should_fail_with "name or id missing", ["--new-name=medium_x", "--path=http://some.path/"]
+      # it_should_fail_with "no params", []
+      # it_should_fail_with "name or id missing", ["--new-name=medium_x", "--path=http://some.path/"]
+      # TODO: temporarily disabled, parameters are checked in the id resolver
     end
 
     with_params ["--id=1", "--new-name=medium_x", "--path=http://some.path/", "--operatingsystem-ids=1,2"] do
-      it_should_call_action :update, {'id' => '1', 'medium' => {'name' => 'medium_x', 'path' => 'http://some.path/', 'operatingsystem_ids' => ['1', '2']}}
+      it_should_call_action :update, {'id' => '1', 'name' => 'medium_x', 'medium' => {'name' => 'medium_x', 'path' => 'http://some.path/', 'operatingsystem_ids' => ['1', '2']}}
     end
 
   end

data/test/unit/model_test.rb

@@ -4,11 +4,7 @@ require File.join(File.dirname(__FILE__), 'apipie_resource_mock')
 
 describe HammerCLIForeman::Model do
 
-  extend CommandTestHelper
-
-  before :each do
-    cmd.stubs(:name_to_id).returns(1)
-  end
+  include CommandTestHelper
 
   context "ListCommand" do
 
@@ -38,7 +34,7 @@ describe HammerCLIForeman::Model do
     context "parameters" do
       it_should_accept "id", ["--id=1"]
       it_should_accept "name", ["--name=model"]
-      it_should_fail_with "no arguments"
+      # it_should_fail_with "no arguments" # TODO: temporarily disabled, parameters are checked in the id resolver
     end
 
     context "output" do
@@ -63,7 +59,8 @@ describe HammerCLIForeman::Model do
 
     context "parameters" do
       it_should_accept "name", ["--name=model", "--info=description", "--vendor-class=class", "--hardware-model=model"]
-      it_should_fail_with "name missing", ["--info=description", "--vendor-class=class", "--hardware-model=model"]
+      # it_should_fail_with "name missing", ["--info=description", "--vendor-class=class", "--hardware-model=model"]
+      # TODO: temporarily disabled, parameters are checked in the api
     end
 
   end
@@ -76,7 +73,7 @@ describe HammerCLIForeman::Model do
     context "parameters" do
       it_should_accept "name", ["--name=model"]
       it_should_accept "id", ["--id=1"]
-      it_should_fail_with "name or id missing", []
+      # it_should_fail_with "name or id missing", [] # TODO: temporarily disabled, parameters are checked in the id resolver
     end
 
   end
@@ -89,8 +86,9 @@ describe HammerCLIForeman::Model do
     context "parameters" do
       it_should_accept "name", ["--name=model", "--new-name=model2", "--info=description", "--vendor-class=class", "--hardware-model=model"]
       it_should_accept "id", ["--id=1", "--new-name=model2", "--info=description", "--vendor-class=class", "--hardware-model=model"]
-      it_should_fail_with "no params", []
-      it_should_fail_with "name or id missing", ["--new-name=model2", "--info=description", "--vendor-class=class", "--hardware-model=model"]
+      # it_should_fail_with "no params", []
+      # it_should_fail_with "name or id missing", ["--new-name=model2", "--info=description", "--vendor-class=class", "--hardware-model=model"]
+      # TODO: temporarily disabled, parameters are checked in the id resolver
     end
 
   end

data/test/unit/operating_system_test.rb

@@ -4,11 +4,7 @@ require File.join(File.dirname(__FILE__), 'apipie_resource_mock')
 
 describe HammerCLIForeman::OperatingSystem do
 
-  extend CommandTestHelper
-
-  before :each do
-    cmd.stubs(:name_to_id).returns(1)
-  end
+  include CommandTestHelper
 
   context "ListCommand" do
 
@@ -27,7 +23,7 @@ describe HammerCLIForeman::OperatingSystem do
       let(:expected_record_count) { cmd.resource.call(:index).length }
 
       it_should_print_n_records
-      it_should_print_column "Name"
+      it_should_print_column "Full name"
       it_should_print_column "Id"
       it_should_print_column "Release name"
       it_should_print_column "Family"
@@ -40,13 +36,9 @@ describe HammerCLIForeman::OperatingSystem do
 
     let(:cmd) { HammerCLIForeman::OperatingSystem::InfoCommand.new("", ctx) }
 
-    before :each do
-      HammerCLIForeman::Parameter.stubs(:get_parameters).returns([])
-    end
-
     context "parameters" do
       it_should_accept "id", ["--id=1"]
-      it_should_fail_with "no arguments"
+      # it_should_fail_with "no arguments" # TODO: temporarily disabled, parameters are checked in the id resolver
     end
 
     context "output" do
@@ -54,12 +46,15 @@ describe HammerCLIForeman::OperatingSystem do
         it_should_print_n_records 1
         it_should_print_column "Name"
         it_should_print_column "Id"
+        it_should_print_column "Major version"
+        it_should_print_column "Minor version"
         it_should_print_column "Release name"
         it_should_print_column "Family"
         it_should_print_column "Installation media"
         it_should_print_column "Architectures"
         it_should_print_column "Partition tables"
-        it_should_print_column "Config templates"
+        it_should_print_column "Templates"
+        it_should_print_column "Default templates"
         it_should_print_column "Parameters"
       end
     end
@@ -73,7 +68,8 @@ describe HammerCLIForeman::OperatingSystem do
 
     context "parameters" do
       it_should_accept "name, major, minor, family, release name", ["--name=media", "--major=1", "--minor=2", "--family=Red Hat", "--release-name=awesome"]
-      it_should_fail_with "name missing", ["--major=1", "--minor=2", "--family=Red Hat", "--release-name=awesome"]
+      # it_should_fail_with "name missing", ["--major=1", "--minor=2", "--family=Red Hat", "--release-name=awesome"]
+      # TODO: temporarily disabled, parameters are checked in the api
     end
 
     with_params ["--name=os", "--major=1", "--minor=2", "--family=Red Hat", "--release-name=awesome"] do
@@ -88,7 +84,8 @@ describe HammerCLIForeman::OperatingSystem do
 
     context "parameters" do
       it_should_accept "id", ["--id=1"]
-      it_should_fail_with "name or id missing", []
+      # it_should_fail_with "name or id missing", [] # TODO: temporarily disabled, parameters are checked in the id resolver
+      # TODO: temporarily disabled, parameters are checked in the id resolver
     end
 
   end
@@ -101,8 +98,9 @@ describe HammerCLIForeman::OperatingSystem do
     context "parameters" do
       it_should_accept "id", ["--id=1"]
       it_should_accept "name, major, minor, family, release name", ["--id=83", "--name=os", "--major=1", "--minor=2", "--family=Red Hat", "--release-name=awesome"]
-      it_should_fail_with "no params", []
-      it_should_fail_with "label or id missing", ["--name=os", "--major=1", "--minor=2", "--family=Red Hat", "--release-name=awesome"]
+      # it_should_fail_with "no params", []
+      # it_should_fail_with "label or id missing", ["--name=os", "--major=1", "--minor=2", "--family=Red Hat", "--release-name=awesome"]
+      # TODO: temporarily disabled, parameters are checked in the id resolver
     end
 
     with_params ["--id=83", "--name=os", "--major=1", "--minor=2", "--family=Red Hat", "--release-name=awesome"] do
@@ -121,10 +119,11 @@ describe HammerCLIForeman::OperatingSystem do
     let(:cmd) { HammerCLIForeman::OperatingSystem::SetParameterCommand.new("", ctx) }
 
     context "parameters" do
-      it_should_accept "name, value and os id", ["--name=domain", "--value=val", "--os-id=id"]
-      it_should_fail_with "name missing", ["--value=val", "--os-id=id"]
-      it_should_fail_with "value missing", ["--name=name", "--os-id=id"]
-      it_should_fail_with "os id missing", ["--name=name", "--value=val"]
+      it_should_accept "name, value and os id", ["--name=domain", "--value=val", "--operatingsystem-id=id"]
+      # it_should_fail_with "name missing", ["--value=val", "--operatingsystem-id=id"]
+      # it_should_fail_with "value missing", ["--name=name", "--operatingsystem-id=id"]
+      # it_should_fail_with "os id missing", ["--name=name", "--value=val"]
+      # TODO: temporarily disabled, parameters are checked in the id resolver
     end
 
   end
@@ -135,9 +134,10 @@ describe HammerCLIForeman::OperatingSystem do
     let(:cmd) { HammerCLIForeman::OperatingSystem::DeleteParameterCommand.new("", ctx) }
 
     context "parameters" do
-      it_should_accept "name and os id", ["--name=domain", "--os-id=id"]
-      it_should_fail_with "name missing", ["--os-id=id"]
-      it_should_fail_with "os id missing", ["--name=name"]
+      it_should_accept "name and os id", ["--name=domain", "--operatingsystem-id=id"]
+      # it_should_fail_with "name missing", ["--operatingsystem-id=id"]
+      # it_should_fail_with "os id missing", ["--name=name"]
+      # TODO: temporarily disabled, parameters are checked in the id resolver
     end
 
   end

data/test/unit/organization_test.rb

@@ -5,13 +5,9 @@ require File.join(File.dirname(__FILE__), 'apipie_resource_mock')
 
 describe HammerCLIForeman::Organization do
 
-  extend CommandTestHelper
+  include CommandTestHelper
   extend ResourceDisabled
 
-  before :each do
-    cmd.stubs(:name_to_id).returns(1)
-  end
-
   context "ListCommand" do
 
     before :each do
@@ -48,7 +44,7 @@ describe HammerCLIForeman::Organization do
     context "parameters" do
       it_should_accept "id", ["--id=1"]
       it_should_accept "name", ["--name=arch"]
-      it_should_fail_with "no arguments"
+      # it_should_fail_with "no arguments" # TODO: temporarily disabled, parameters are checked in the id resolver
     end
 
     context "output" do
@@ -73,7 +69,8 @@ describe HammerCLIForeman::Organization do
 
     context "parameters" do
       it_should_accept "name", ["--name=org"]
-      it_should_fail_with "name missing", []
+      # it_should_fail_with "name missing", []
+      # TODO: temporarily disabled, parameters are checked in the api
     end
 
     with_params ["--name=org"] do
@@ -89,7 +86,9 @@ describe HammerCLIForeman::Organization do
     context "parameters" do
       it_should_accept "name", ["--name=org"]
       it_should_accept "id", ["--id=1"]
-      it_should_fail_with "name or id missing", []
+
+      # it_should_fail_with "name or id missing", []
+      # TODO: temporarily disabled, parameters are checked in the id resolver
     end
 
     with_params ["--id=1"] do
@@ -105,8 +104,8 @@ describe HammerCLIForeman::Organization do
     context "parameters" do
       it_should_accept "name", ["--name=org", "--new-name=org2"]
       it_should_accept "id", ["--id=1", "--new-name=org2"]
-      it_should_fail_with "no params", []
-      it_should_fail_with "name or id missing", ["--new-name=org2"]
+      # it_should_fail_with "no params", [] # TODO: temporarily disabled, parameters are checked in the id resolver
+      # it_should_fail_with "name or id missing", ["--new-name=org2"] # TODO: temporarily disabled, parameters are checked in the id resolver
     end
 
     with_params ["--id=1"] do

data/test/unit/output/formatters_test.rb

@@ -1,34 +1,147 @@
 require File.join(File.dirname(__FILE__), '../test_helper')
 
-describe HammerCLIForeman::Output::Formatters::OSNameFormatter do
-  it "formats the os name" do
-    formatter = HammerCLIForeman::Output::Formatters::OSNameFormatter.new
-    formatter.format({ :name => 'OS', :major => '1', :minor => '2' }).must_equal 'OS 1.2'
+
+describe HammerCLIForeman::Output::Formatters::SingleReferenceFormatter do
+
+  let(:formatter) { HammerCLIForeman::Output::Formatters::SingleReferenceFormatter.new }
+  let(:reference) do
+    {
+      :server_id => 1,
+      :server_name => 'Server',
+    }
   end
-  it "formats the os name with only major version" do
-    formatter = HammerCLIForeman::Output::Formatters::OSNameFormatter.new
-    formatter.format({ :name => 'Fedora', :major => '19'}).must_equal 'Fedora 19'
+
+  let(:reference_str_keys) do
+    reference.inject({}) do |new_ref, (key, value)|
+      new_ref.update(key.to_s => value)
+    end
   end
 
-  it "recovers when os is nil" do
-    formatter = HammerCLIForeman::Output::Formatters::OSNameFormatter.new
-    formatter.format(nil).must_equal nil
+  context "with symbol keys" do
+    it "formats name" do
+      options = {:key => :server}
+      formatter.format(reference, options).must_equal 'Server'
+    end
+
+    it "formats id" do
+      options = {:key => :server, :context => {:show_ids => true}}
+      formatter.format(reference, options).must_equal 'Server (id: 1)'
+    end
+  end
+
+  context "with string keys" do
+    it "formats name" do
+      options = {:key => :server}
+      formatter.format(reference_str_keys, options).must_equal 'Server'
+    end
+
+    it "formats id" do
+      options = {:key => :server, :context => {:show_ids => true}}
+      formatter.format(reference_str_keys, options).must_equal 'Server (id: 1)'
+    end
   end
+
 end
 
-describe HammerCLIForeman::Output::Formatters::ServerFormatter do
-  it "formats the server" do
-    formatter = HammerCLIForeman::Output::Formatters::ServerFormatter.new
-    formatter.format({ :name => 'Server', :url => "URL"}).must_equal 'Server (URL)'
+describe HammerCLIForeman::Output::Formatters::ReferenceFormatter do
+
+  let(:formatter) { HammerCLIForeman::Output::Formatters::ReferenceFormatter.new }
+  let(:reference) do
+    {
+      :id => 1,
+      :another_id => 2,
+      :name => 'Server',
+      :another_name => 'SERVER',
+      :url => "URL",
+      :desc => "Description"
+    }
   end
 
-  it "formats the server" do
-    formatter = HammerCLIForeman::Output::Formatters::ServerFormatter.new
-    formatter.format({ 'name' => 'Server', 'url' => "URL"}).must_equal 'Server (URL)'
+
+  it "recovers when the resource is missing" do
+    formatter.format(nil).must_equal ''
   end
 
-  it "recovers when server is nil" do
-    formatter = HammerCLIForeman::Output::Formatters::ServerFormatter.new
-    formatter.format(nil).must_equal nil
+  context "with symbol keys" do
+    let(:reference_sym_keys) do
+      reference
+    end
+
+    it "formats name" do
+      formatter.format(reference_sym_keys, {}).must_equal 'Server'
+    end
+
+    it "can override name key" do
+      options = {:name_key => :another_name}
+      formatter.format(reference_sym_keys, options).must_equal 'SERVER'
+    end
+
+    it "formats id" do
+      options = {:context => {:show_ids => true}}
+      formatter.format(reference_sym_keys, options).must_equal 'Server (id: 1)'
+    end
+
+    it "can override id key" do
+      options = {:id_key => :another_id, :context => {:show_ids => true}}
+      formatter.format(reference_sym_keys, options).must_equal 'Server (id: 2)'
+    end
+
+    it "formats details" do
+      options = {:details => :url}
+      formatter.format(reference_sym_keys, options).must_equal 'Server (URL)'
+    end
+
+    it "formats multiple details" do
+      options = {:details => [:url, :desc]}
+      formatter.format(reference_sym_keys, options).must_equal 'Server (URL, Description)'
+    end
+
+    it "formats details and id" do
+      options = {:context => {:show_ids => true}, :details => [:url, :desc]}
+      formatter.format(reference_sym_keys, options).must_equal 'Server (URL, Description, id: 1)'
+    end
   end
+
+  context "with string keys" do
+    let(:reference_str_keys) do
+      reference.inject({}) do |new_ref, (key, value)|
+        new_ref.update(key.to_s => value)
+      end
+    end
+
+    it "formats name" do
+      formatter.format(reference_str_keys, {}).must_equal 'Server'
+    end
+
+    it "can override name key" do
+      options = {:name_key => :another_name}
+      formatter.format(reference_str_keys, options).must_equal 'SERVER'
+    end
+
+    it "formats id" do
+      options = {:context => {:show_ids => true}}
+      formatter.format(reference_str_keys, options).must_equal 'Server (id: 1)'
+    end
+
+    it "can override id key" do
+      options = {:id_key => :another_id, :context => {:show_ids => true}}
+      formatter.format(reference_str_keys, options).must_equal 'Server (id: 2)'
+    end
+
+    it "formats details" do
+      options = {:details => :url}
+      formatter.format(reference_str_keys, options).must_equal 'Server (URL)'
+    end
+
+    it "formats multiple details" do
+      options = {:details => [:url, :desc]}
+      formatter.format(reference_str_keys, options).must_equal 'Server (URL, Description)'
+    end
+
+    it "formats details and id" do
+      options = {:context => {:show_ids => true}, :details => [:url, :desc]}
+      formatter.format(reference_str_keys, options).must_equal 'Server (URL, Description, id: 1)'
+    end
+  end
+
 end