foreman_discovery 6.0.0 → 7.0.0

data/test/functional/discovery_rules_controller_test.rb

@@ -20,37 +20,54 @@ class DiscoveryRulesControllerTest < ActionController::TestCase
     assert_response :success
   end
 
-  test "should create discovery rule" do
+  test "should create discovery rule without taxonomy" do
     assert_difference('DiscoveryRule.count') do
       post :create, {:discovery_rule => {
         :name => "foo",
-        :search => "bar",
+        :search => "cpu_count = 42",
         :hostgroup_id => 1,
         :hostname => "",
         :priority => 1}}, set_session_user_default_manager
+      assert_empty(extract_form_errors(response))
     end
+    assert_redirected_to discovery_rules_path
+  end
 
+  test "should create discovery rule with taxonomy" do
+    assert_difference('DiscoveryRule.count') do
+      hostgroup = FactoryGirl.create(:hostgroup, :with_os, :with_rootpass, :organizations => [Organization.first], :locations => [Location.first])
+      post :create, {:discovery_rule => {
+        :name => "foo",
+        :search => "cpu_count = 42",
+        :hostgroup_id => hostgroup.id,
+        :organization_ids => [Organization.first],
+        :location_ids => [Location.first.id],
+        :hostname => "",
+        :priority => 1}}, set_session_user_default_manager
+      assert_empty(extract_form_errors(response))
+    end
     assert_redirected_to discovery_rules_path
   end
 
   test "should get edit" do
     rule = FactoryGirl.create(:discovery_rule)
-    get :edit, {:id => rule.to_param}, set_session_user_default_manager
+    get :edit, {:id => rule.id}, set_session_user_default_manager
     assert_response :success
   end
 
   test "should update discovery rule" do
     rule = FactoryGirl.create(:discovery_rule)
-    put :update, {:id => rule.to_param, :discovery_rule => {}}, set_session_user_default_manager
+    put :update, {:id => rule.id, :discovery_rule => {:name => "new_name"}}, set_session_user_default_manager
+    assert_nil flash[:error]
     assert_redirected_to discovery_rules_path
   end
 
   test "should destroy discovery rule" do
     rule = FactoryGirl.create(:discovery_rule)
     assert_difference('DiscoveryRule.count', -1) do
-      delete :destroy, {:id => rule.to_param}, set_session_user_default_manager
+      delete :destroy, {:id => rule.id}, set_session_user_default_manager
     end
-
+    assert_nil flash[:error]
     assert_redirected_to discovery_rules_path
   end
 

data/test/test_helper_discovery.rb

@@ -22,3 +22,7 @@ end
 def set_session_user_default_manager
   set_session_user_with_perms Foreman::Plugin.find('foreman_discovery').default_roles['Discovery Manager']
 end
+
+def extract_form_errors(response)
+  response.body.scan(/error-message[^<]*</)
+end

data/test/unit/discovered_extensions_test.rb

@@ -181,6 +181,8 @@ class FindDiscoveryRulesTest < ActiveSupport::TestCase
     assert managed_host = perform_auto_provision(host, r1)
     assert_empty managed_host.errors
     assert_equal hostgroup.environment, managed_host.environment
+    assert_equal hostgroup.puppet_proxy, managed_host.puppet_proxy
+    assert_equal hostgroup.puppet_ca_proxy, managed_host.puppet_ca_proxy
   end
 
   def setup_normal_renderer

data/test/unit/fact_value_extensions_test.rb

@@ -0,0 +1,11 @@
+require 'test_helper'
+
+class FactValueExtensionsTest < ActiveSupport::TestCase
+  describe '.host' do
+    test 'returns discovered_host' do
+      discovered_host = FactoryGirl.create(:discovered_host, :with_facts, :fact_count => 1)
+      fact_value = discovered_host.fact_values.first
+      assert fact_value.discovered_host, fact_value.host
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_discovery
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 7.0.0
 platform: ruby
 authors:
 - Amos Benari
@@ -32,7 +32,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-29 00:00:00.000000000 Z
+date: 2016-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -62,6 +62,8 @@ files:
 - app/controllers/api/v2/discovery_rules_controller.rb
 - app/controllers/api/v2/fact_values_controller_extensions.rb
 - app/controllers/concerns/foreman/controller/discovered_extensions.rb
+- app/controllers/concerns/foreman/controller/parameters/discovered_host.rb
+- app/controllers/concerns/foreman/controller/parameters/discovery_rule.rb
 - app/controllers/discovered_hosts_controller.rb
 - app/controllers/discovery_rules_controller.rb
 - app/helpers/discovered_hosts_helper.rb
@@ -76,6 +78,7 @@ files:
 - app/models/host/discovered.rb
 - app/models/host/managed_extensions.rb
 - app/models/hostgroup_extensions.rb
+- app/models/nic/managed_extensions.rb
 - app/models/setting/discovered.rb
 - app/overrides/subnet_form_with_discovery_proxy.rb
 - app/services/foreman_discovery/fact_parser.rb
@@ -99,6 +102,7 @@ files:
 - app/views/dashboard/_discovery_widget_host.html.erb
 - app/views/dashboard/_discovery_widget_host_list.html.erb
 - app/views/discovered_hosts/_discovered_host.html.erb
+- app/views/discovered_hosts/_discovered_host_modal.html.erb
 - app/views/discovered_hosts/_discovered_hosts_list.html.erb
 - app/views/discovered_hosts/_selected_hosts.html.erb
 - app/views/discovered_hosts/index.html.erb
@@ -209,12 +213,13 @@ files:
 - test/unit/discovery_rule_test.rb
 - test/unit/discovery_taxonomy_extensions_test.rb
 - test/unit/fact_parser_test.rb
+- test/unit/fact_value_extensions_test.rb
 - test/unit/facts.json
 - test/unit/host_discovered_test.rb
 - test/unit/setting_discovered_test.rb
 homepage: http://github.com/theforeman/foreman_discovery
 licenses:
-- GPL-3
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -248,6 +253,7 @@ test_files:
 - test/unit/discovery_attribute_set_test.rb
 - test/unit/setting_discovered_test.rb
 - test/unit/facts.json
+- test/unit/fact_value_extensions_test.rb
 - test/unit/discovered_mailer_test.rb
 - test/unit/discovery_taxonomy_extensions_test.rb
 - test/unit/discovery_rule_test.rb