foreman_discovery 9.0.0 → 9.1.0

data/locale/zh_CN/foreman_discovery.po

@@ -5,9 +5,9 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 8.0.0\n"
+"Project-Id-Version: foreman_discovery 9.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2017-03-15 12:38+0000\n"
+"PO-Revision-Date: 2017-04-08 10:07+0000\n"
 "Last-Translator: Lukáš Zapletal\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/foreman/foreman/langu"
 "age/zh_CN/)\n"
@@ -77,6 +77,9 @@ msgstr ""
 msgid "Could not get facts from proxy %{url}: %{error}"
 msgstr "无法从代理服务器  %{url} 获取详情： %{error}"
 
+msgid "Create Rule"
+msgstr ""
+
 msgid "Create a discovered host for testing (use /facts to create new hosts)"
 msgstr "创建发现的主机以进行测试（使用 /facts 创建新主机）"
 
@@ -104,6 +107,9 @@ msgstr ""
 msgid "Destroyed selected hosts"
 msgstr "消除所选主机"
 
+msgid "Details"
+msgstr ""
+
 msgid "Disable"
 msgstr "禁用"
 
@@ -285,6 +291,9 @@ msgstr ""
 msgid "Hostnames must not start with numbers. A good approach is to use unique information provided by facter (MAC address, BIOS or serial ID)."
 msgstr ""
 
+msgid "Hosts"
+msgstr ""
+
 msgid "Hosts limit"
 msgstr "主机限制"
 
@@ -402,9 +411,6 @@ msgstr ""
 msgid "New Discovery Rule"
 msgstr "新发现规则"
 
-msgid "New Rule"
-msgstr "新规则"
-
 msgid "New in the last 24 hours"
 msgstr "在过去 24 小时内新建"
 
@@ -438,6 +444,9 @@ msgstr "未找到主机 %s 的规则"
 msgid "Not reported in more than 7 days"
 msgstr "超过 7 天没有报告的"
 
+msgid "One or more hosts have been discovered"
+msgstr ""
+
 msgid "Organization"
 msgstr "机构"
 
@@ -585,9 +594,6 @@ msgstr ""
 msgid "Target host group for this rule with all properties set"
 msgstr "根据所有属性设置标定主机组"
 
-msgid "Template"
-msgstr "模板"
-
 msgid "The default location to place discovered hosts in"
 msgstr "找到主机的默认位置"
 

data/locale/zh_TW/foreman_discovery.edit.po

@@ -5,10 +5,10 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 8.0.0\n"
+"Project-Id-Version: foreman_discovery 9.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-06 08:26+0100\n"
-"PO-Revision-Date: 2017-03-15 12:38+0000\n"
+"POT-Creation-Date: 2017-04-07 13:02+0200\n"
+"PO-Revision-Date: 2017-04-08 10:07+0000\n"
 "Last-Translator: Lukáš Zapletal\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/foreman/foreman/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -365,6 +365,7 @@ msgid "%s - The following hosts are about to be changed"
 msgstr "%s - 以下主機即將受到更改"
 
 #: ../app/helpers/discovered_hosts_helper.rb:49
+#: ../app/views/dashboard/_discovery_widget_host.html.erb:2
 msgid "N/A"
 msgstr "N/A"
 
@@ -385,7 +386,7 @@ msgid "Provision"
 msgstr "佈建"
 
 #: ../app/helpers/discovery_rules_helper.rb:26
-#: ../lib/foreman_discovery/engine.rb:163
+#: ../lib/foreman_discovery/engine.rb:165
 msgid "Discovered Hosts"
 msgstr ""
 
@@ -442,43 +443,43 @@ msgid_plural ""
 "Host group locations %s must also be associated to the discovery rule"
 msgstr[0] ""
 
-#: ../app/models/host/discovered.rb:38
+#: ../app/models/host/discovered.rb:37
 msgid "Invalid facts, must be a Hash"
 msgstr "詳情無效，必須是雜湊"
 
-#: ../app/models/host/discovered.rb:43
+#: ../app/models/host/discovered.rb:42
 msgid ""
 "Expected discovery_fact '%s' is missing, unable to detect primary interface "
 "and set hostname"
 msgstr "沒有預期的 discovery_fact '%s'，無法偵測主介面並設定主機名稱"
 
-#: ../app/models/host/discovered.rb:50
+#: ../app/models/host/discovered.rb:49
 msgid ""
 "Invalid facts: hash does not contain a valid value for any of the facts in "
 "the discovery_hostname setting: %s"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:67
+#: ../app/models/host/discovered.rb:66
 msgid "Facts could not be imported"
 msgstr ""
 
-#: ../app/models/host/discovered.rb:117
+#: ../app/models/host/discovered.rb:116
 msgid "Unable to assign subnet, primary interface is missing IP address"
 msgstr "無法指定子網路，主介面沒有 IP 位址"
 
-#: ../app/models/host/discovered.rb:174
+#: ../app/models/host/discovered.rb:173
 msgid "Could not get facts from proxy %{url}: %{error}"
 msgstr "無法由協定 %{url} 取得詳細資料：%{error}"
 
-#: ../app/models/host/discovered.rb:190
+#: ../app/models/host/discovered.rb:189
 msgid "Unable to reboot %{name} via %{url}: %{msg}"
 msgstr "無法透過 %{url} 重新啟動 %{name}：%{msg}"
 
-#: ../app/models/host/discovered.rb:198
+#: ../app/models/host/discovered.rb:197
 msgid "Unable to perform kexec on %{name} via %{url}: %{msg}"
 msgstr "無法透過 %{url} 在 %{name} 上執行 kexec：%{msg}"
 
-#: ../app/models/host/discovered.rb:217
+#: ../app/models/host/discovered.rb:216
 msgid "Invalid hostname: Could not normalize the hostname"
 msgstr ""
 
@@ -715,7 +716,7 @@ msgid "Create host"
 msgstr ""
 
 #: ../app/views/discovered_hosts/_discovered_hosts_list.html.erb:2
-#: ../lib/foreman_discovery/engine.rb:148
+#: ../lib/foreman_discovery/engine.rb:150
 msgid "Discovered hosts"
 msgstr "發現的主機"
 
@@ -878,23 +879,19 @@ msgstr "組織"
 msgid "Target host group for this rule with all properties set"
 msgstr "此規則的目標主機群組，並且設置了所有內容"
 
-#: ../app/views/discovery_rules/_form.html.erb:24
-msgid "Template"
-msgstr "範本"
-
-#: ../app/views/discovery_rules/_form.html.erb:26
+#: ../app/views/discovery_rules/_form.html.erb:25
 msgid "Hostname for provisioned hosts"
 msgstr "已佈建之主機的主機名稱"
 
-#: ../app/views/discovery_rules/_form.html.erb:27
+#: ../app/views/discovery_rules/_form.html.erb:26
 msgid "Hosts limit"
 msgstr "主機限制"
 
-#: ../app/views/discovery_rules/_form.html.erb:27
+#: ../app/views/discovery_rules/_form.html.erb:26
 msgid "Maximum hosts provisioned with this rule (0 = unlimited)"
 msgstr "以此規則佈建的主機已達到最大限制（0 = 無限制）"
 
-#: ../app/views/discovery_rules/_form.html.erb:28
+#: ../app/views/discovery_rules/_form.html.erb:27
 msgid "Rule priority (lower integer means higher priority)"
 msgstr "規則優先順序（愈小的數字代表愈高的優先權）"
 
@@ -937,8 +934,8 @@ msgid "Discovery Rules"
 msgstr "搜尋規則"
 
 #: ../app/views/discovery_rules/index.html.erb:2
-msgid "New Rule"
-msgstr "新規則"
+msgid "Create Rule"
+msgstr ""
 
 #: ../app/views/discovery_rules/index.html.erb:6
 msgid "DiscoveryRule|Name"
@@ -972,21 +969,33 @@ msgstr "新的搜尋規則"
 msgid "A summary of discovered hosts"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:153
+#: ../db/seeds.d/80_discovery_ui_notification.rb:4
+msgid "Hosts"
+msgstr ""
+
+#: ../db/seeds.d/80_discovery_ui_notification.rb:6
+msgid "One or more hosts have been discovered"
+msgstr ""
+
+#: ../db/seeds.d/80_discovery_ui_notification.rb:13
+msgid "Details"
+msgstr ""
+
+#: ../lib/foreman_discovery/engine.rb:155
 msgid "Discovery rules"
 msgstr "搜尋規則"
 
-#: ../lib/foreman_discovery/engine.rb:176
+#: ../lib/foreman_discovery/engine.rb:178
 msgid "Discovery Proxy"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:177
+#: ../lib/foreman_discovery/engine.rb:179
 msgid ""
 "Discovery Proxy to use within this subnet for managing connection to "
 "discovered hosts"
 msgstr ""
 
-#: ../lib/foreman_discovery/engine.rb:178
+#: ../lib/foreman_discovery/engine.rb:180
 msgid ""
 "ID of Discovery Proxy to use within this subnet for managing connection to "
 "discovered hosts"

data/locale/zh_TW/foreman_discovery.po

@@ -5,9 +5,9 @@
 # Translators:
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_discovery 8.0.0\n"
+"Project-Id-Version: foreman_discovery 9.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2017-03-15 12:38+0000\n"
+"PO-Revision-Date: 2017-04-08 10:07+0000\n"
 "Last-Translator: Lukáš Zapletal\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/foreman/foreman/lang"
 "uage/zh_TW/)\n"
@@ -77,6 +77,9 @@ msgstr ""
 msgid "Could not get facts from proxy %{url}: %{error}"
 msgstr "無法由協定 %{url} 取得詳細資料：%{error}"
 
+msgid "Create Rule"
+msgstr ""
+
 msgid "Create a discovered host for testing (use /facts to create new hosts)"
 msgstr "建立測試用的搜尋主機（使用 /facts 來建立新主機）"
 
@@ -104,6 +107,9 @@ msgstr ""
 msgid "Destroyed selected hosts"
 msgstr "刪除選擇的主機"
 
+msgid "Details"
+msgstr ""
+
 msgid "Disable"
 msgstr "停用"
 
@@ -285,6 +291,9 @@ msgstr ""
 msgid "Hostnames must not start with numbers. A good approach is to use unique information provided by facter (MAC address, BIOS or serial ID)."
 msgstr ""
 
+msgid "Hosts"
+msgstr ""
+
 msgid "Hosts limit"
 msgstr "主機限制"
 
@@ -402,9 +411,6 @@ msgstr ""
 msgid "New Discovery Rule"
 msgstr "新的搜尋規則"
 
-msgid "New Rule"
-msgstr "新規則"
-
 msgid "New in the last 24 hours"
 msgstr "過去 24 小時的新項目"
 
@@ -438,6 +444,9 @@ msgstr "未找到主機 %s 的規則"
 msgid "Not reported in more than 7 days"
 msgstr "七天內未回報"
 
+msgid "One or more hosts have been discovered"
+msgstr ""
+
 msgid "Organization"
 msgstr "組織"
 
@@ -585,9 +594,6 @@ msgstr ""
 msgid "Target host group for this rule with all properties set"
 msgstr "此規則的目標主機群組，並且設置了所有內容"
 
-msgid "Template"
-msgstr "範本"
-
 msgid "The default location to place discovered hosts in"
 msgstr "放置已發現之主機的預設位置"
 

data/test/factories/discovery_host_related.rb

@@ -0,0 +1,26 @@
+FactoryGirl.define do
+  factory :discovered_host, class: 'Host::Discovered' do
+    sequence(:name) { |n| "host#{n}" }
+    sequence(:ip)   { |n| IPAddr.new(n, Socket::AF_INET).to_s }
+    sequence(:mac)  { |n| "02:23:45:67:" + n.to_s(16).rjust(4, '0').insert(2, ':') }
+
+    after(:build) do |discovered_host|
+      attribute_set = DiscoveryAttributeSet.new(:host => discovered_host,
+                                                :memory => '1',
+                                                :cpu_count => '4')
+      discovered_host.discovery_attribute_set = attribute_set
+    end
+
+    trait :with_facts do
+      transient do
+        fact_count 20
+      end
+
+      after(:create) do |discovered_host, evaluator|
+        evaluator.fact_count.times do
+          FactoryGirl.create(:fact_value, :host => discovered_host)
+        end
+      end
+    end
+  end
+end

data/test/factories/discovery_rule_related.rb

@@ -11,30 +11,3 @@ FactoryGirl.define do
     locations { [location_one] } if SETTINGS[:locations_enabled]
   end
 end
-
-FactoryGirl.define do
-  factory :discovered_host, class: 'Host::Discovered' do
-    sequence(:name) { |n| "host#{n}" }
-    sequence(:ip)   { |n| IPAddr.new(n, Socket::AF_INET).to_s }
-    sequence(:mac)  { |n| "02:23:45:67:" + n.to_s(16).rjust(4, '0').insert(2, ':') }
-
-    after(:build) do |discovered_host|
-      attribute_set = DiscoveryAttributeSet.new(:host => discovered_host,
-                                                :memory => '1',
-                                                :cpu_count => '4')
-      discovered_host.discovery_attribute_set = attribute_set
-    end
-
-    trait :with_facts do
-      transient do
-        fact_count 20
-      end
-
-      after(:create) do |discovered_host, evaluator|
-        evaluator.fact_count.times do
-          FactoryGirl.create(:fact_value, :discovered_host => discovered_host)
-        end
-      end
-    end
-  end
-end

data/test/functional/api/v2/discovered_hosts_controller_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'test_plugin_helper'
 
 class Api::V2::DiscoveredHostsControllerTest < ActionController::TestCase
 
@@ -13,7 +13,6 @@ class Api::V2::DiscoveredHostsControllerTest < ActionController::TestCase
     SETTINGS[:organizations_enabled] = true
     SETTINGS[:locations_enabled] = true
     FactoryGirl.create(:subnet, :network => "192.168.100.1", :mask => "255.255.255.0", :locations => [location_one], :organizations => [organization_one])
-    User.current = User.find_by_login "admin"
     @request.env['HTTP_REFERER'] = '/discovery_rules'
     @facts = {
       "interfaces"        => "lo,eth0",
@@ -83,18 +82,21 @@ class Api::V2::DiscoveredHostsControllerTest < ActionController::TestCase
   end
 
   def test_auto_provision_success_via_upload
+    reset_api_credentials
+    User.current = nil
     disable_orchestration
     facts = @facts.merge({"somefact" => "abc"})
     taxonomy = { :organizations => [organization_one], :locations => [location_one] }
     DiscoveryRule.create({:priority => 1, :name => 'rule', :search => "facts.somefact = abc", :hostgroup => FactoryGirl.create(:hostgroup, :with_os, :with_rootpass, taxonomy)}.merge(taxonomy))
-    as_user(:one) do
-      post :facts, { :facts => facts }
-    end
+    post :facts, { :facts => facts }
 
     assert_response :success
     actual = JSON.parse(response.body)
+    assert_not_nil id = actual['id']
+    assert !Host::Discovered.unscoped.where(id: id).exists?, 'discovered host still exists!'
+    assert Host.unscoped.where(id: id).exists?, 'host was not auto provisioned!'
     assert_not_nil actual['created_at']
-    assert_equal "Auto-discovered and provisioned via rule 'rule'", Host.unscoped.find(actual['id']).comment
+    assert_equal "Auto-discovered and provisioned via rule 'rule'", Host.unscoped.find(id).comment
   end
 
   def test_auto_provision_success

data/test/functional/api/v2/discovery_rules_controller_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'test_plugin_helper'
 
 class Api::V2::DiscoveryRulesControllerTest < ActionController::TestCase
   setup do
@@ -23,10 +23,13 @@ class Api::V2::DiscoveryRulesControllerTest < ActionController::TestCase
     assert_equal 1, discovery_rules['total']
   end
 
-  test "should show discovery rule" do
+  test "should show discovery rule with taxonomy" do
     rule = FactoryGirl.create(:discovery_rule)
     get :show, { :id => rule.to_param }
     assert_response :success
+    discovery_rule = ActiveSupport::JSON.decode(@response.body)
+    assert_equal "Organization 1", discovery_rule['organizations'].first['name']
+    assert_equal "Location 1", discovery_rule['locations'].first['name']
   end
 
   test "should create discovery rule with taxonomy" do

data/test/functional/api/v2/fact_value_extensions_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require 'test_plugin_helper'
 
 module Api
   module V2
@@ -27,7 +27,7 @@ module Api
         disable_orchestration
         facts = @facts.merge({ "somefact" => "abc" })
         host = Host::Discovered.import_host(facts)
-        get :index, { :discovered_host_id => host.id }
+        get :index, { :host_id => host.id }
         assert_response :success
         show_response = ActiveSupport::JSON.decode(@response.body)
         assert_equal "abc", show_response['results'].values.first['somefact']

data/test/functional/discovered_hosts_controller_test.rb

@@ -1,5 +1,4 @@
 require 'test_plugin_helper'
-require 'test_helper_discovery'
 
 class DiscoveredHostsControllerTest < ActionController::TestCase
   setup :initialize_host
@@ -37,6 +36,15 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
     assert_response :success
   end
 
+  def test_show_multiple_actions
+    host = Host::Discovered.import_host(@facts)
+    [:multiple_destroy, :select_multiple_organization, :select_multiple_location].each do |path|
+      xhr :post, path, {:host_ids => [host.id]}, set_session_user
+      assert_response :success
+      assert response.body =~ /#{host.name}/
+    end
+  end
+
   def test_show_page_categories
     host = Host::Discovered.import_host(@facts)
     get :show, {:id => host.id}, set_session_user_default_reader
@@ -119,29 +127,31 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
   end
 
   def test_update_inheritance
-    host = Host::Discovered.import_host(@facts)
-    hostgroup = setup_hostgroup(host)
-    put :update, {
-      commit: 'Update',
-      id: host.id,
-      host: {
-        name: 'mytest',
-        hostgroup_id: hostgroup.id
-      }
-    }, set_session_user_default_manager
-
-    # Get the managed host instance from the DB
-    actual = Host.find(host.id)
-
-    assert_equal hostgroup.id, actual.hostgroup_id
-    assert_equal hostgroup.architecture_id, actual.architecture_id
-    assert_equal hostgroup.operatingsystem_id, actual.operatingsystem_id
-    assert_equal hostgroup.medium_id, actual.medium_id
-    assert_equal hostgroup.ptable_id, actual.ptable_id
-    assert_equal hostgroup.domain_id, actual.domain_id
-    assert_equal hostgroup.environment_id, actual.environment_id
-    assert_equal hostgroup.puppet_proxy_id, actual.puppet_proxy_id
-    assert_equal hostgroup.puppet_ca_proxy_id, actual.puppet_ca_proxy_id
+    as_default_manager do
+      host = Host::Discovered.import_host(@facts)
+      hostgroup = setup_hostgroup(host)
+      put :update, {
+        commit: 'Update',
+        id: host.id,
+        host: {
+          name: 'mytest',
+          hostgroup_id: hostgroup.id
+        }
+      }, set_session_user(User.current)
+
+      # Get the managed host instance from the DB
+      actual = Host.find(host.id)
+
+      assert_equal hostgroup.id, actual.hostgroup_id
+      assert_equal hostgroup.architecture_id, actual.architecture_id
+      assert_equal hostgroup.operatingsystem_id, actual.operatingsystem_id
+      assert_equal hostgroup.medium_id, actual.medium_id
+      assert_equal hostgroup.ptable_id, actual.ptable_id
+      assert_equal hostgroup.domain_id, actual.domain_id
+      assert_equal hostgroup.environment_id, actual.environment_id
+      assert_equal hostgroup.puppet_proxy_id, actual.puppet_proxy_id
+      assert_equal hostgroup.puppet_ca_proxy_id, actual.puppet_ca_proxy_id
+    end
   end
 
   def test_add_entry_to_nav_menu
@@ -193,48 +203,68 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
   end
 
   def test_auto_provision_success
-    disable_orchestration
-    facts = @facts.merge({"somefact" => "abc"})
-    host = Host::Discovered.import_host(facts)
-    hostgroup = setup_hostgroup(host)
-    FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc", :hostgroup => hostgroup, :organizations => [host.organization], :locations => [host.location])
-    post :auto_provision, { :id => host.id }, set_session_user_default_manager
-    assert_response :redirect
-    assert_nil flash[:error]
-    assert_match /^Host macaabbccddeeff.* was provisioned/, flash[:notice]
-    managed_host = Host.find(host.id)
-    assert managed_host.build
+    as_default_manager do
+      disable_orchestration
+      facts = @facts.merge({"somefact" => "abc"})
+      host = Host::Discovered.import_host(facts)
+      hostgroup = setup_hostgroup(host)
+      FactoryGirl.create(:discovery_rule, :priority => 1, :search => "facts.somefact = abc", :hostgroup => hostgroup, :organizations => [host.organization], :locations => [host.location])
+      post :auto_provision, { :id => host.id }, set_session_user(User.current)
+      assert_response :redirect
+      assert_nil flash[:error]
+      assert_match(/^Host macaabbccddeeff.* was provisioned/, flash[:notice])
+      managed_host = Host.find(host.id)
+      assert managed_host.build
+    end
   end
 
   def test_auto_provision_no_rule_success
-    disable_orchestration
-    facts = @facts.merge({"somefact" => "abc"})
-    host = Host::Discovered.import_host(facts)
-    post :auto_provision, { :id => host.id }, set_session_user_default_manager
+    as_default_manager do
+      disable_orchestration
+      facts = @facts.merge({"somefact" => "abc"})
+      host = Host::Discovered.import_host(facts)
+      post :auto_provision, { :id => host.id }, set_session_user(User.current)
+    end
     assert_response :redirect
     assert_nil flash[:error]
     assert_equal "No rule found for host macaabbccddeeff", flash[:notice]
   end
 
   def test_auto_provision_all_success
-    disable_orchestration
-    facts = @facts.merge({"somefact" => "abc"})
-    host = Host::Discovered.import_host(facts)
-    taxonomy = { :organizations => [host.organization], :locations => [host.location] }
-    FactoryGirl.create(:discovery_rule, {:priority => 1, :search => "facts.somefact = abc", :hostgroup => FactoryGirl.create(:hostgroup, :with_os, :with_rootpass, taxonomy)}.merge(taxonomy))
-    post :auto_provision_all, {}, set_session_user_default_manager
+    as_default_manager do
+      disable_orchestration
+      facts = @facts.merge({"somefact" => "abc"})
+      host = Host::Discovered.import_host(facts)
+      hostgroup = setup_hostgroup(host)
+      FactoryGirl.create(
+        :discovery_rule,
+        :priority => 1,
+        :search => "facts.somefact = abc",
+        :hostgroup => hostgroup,
+        :organizations => [host.organization], :locations => [host.location]
+      )
+      post :auto_provision_all, {}, set_session_user(User.current)
+    end
     assert_response :redirect
     assert_nil flash[:error]
     assert_equal "Discovered hosts are provisioning now", flash[:notice]
   end
 
   def test_auto_provision_all_no_rule_success
-    disable_orchestration
-    facts = @facts.merge({"somefact" => "abc"})
-    host = Host::Discovered.import_host(facts)
-    taxonomy = { :organizations => [host.organization], :locations => [host.location] }
-    FactoryGirl.create(:discovery_rule, {:priority => 1, :search => "facts.somefact = abc", :hostgroup => FactoryGirl.create(:hostgroup, :with_os, :with_rootpass, taxonomy)}.merge(taxonomy))
-    post :auto_provision_all, {}, set_session_user_default_manager
+    as_default_manager do
+      disable_orchestration
+      facts = @facts.merge({"somefact" => "abc"})
+      host = Host::Discovered.import_host(facts)
+      hostgroup = setup_hostgroup(host)
+      FactoryGirl.create(
+        :discovery_rule,
+        :priority => 1,
+        :search => "facts.somefact = abc",
+        :hostgroup => hostgroup,
+        :organizations => [host.organization], :locations => [host.location]
+      )
+      post :auto_provision_all, {}, set_session_user(User.current)
+    end
     assert_response :redirect
     assert_nil flash[:error]
     assert_equal "Discovered hosts are provisioning now", flash[:notice]
@@ -263,7 +293,7 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
 
   def test_reboot_all_error
     @request.env["HTTP_REFERER"] = discovered_hosts_url
-    host = Host::Discovered.import_host(@facts)
+    Host::Discovered.import_host(@facts)
     ::ForemanDiscovery::NodeAPI::PowerService.any_instance.expects(:reboot).raises("request failed")
     post "reboot_all", { }, set_session_user_default_manager
     assert_redirected_to discovered_hosts_url
@@ -272,38 +302,44 @@ class DiscoveredHostsControllerTest < ActionController::TestCase
   end
 
   def test_no_dns_rebuild_if_dns_pending
-    host = Host::Discovered.import_host(@facts)
-    hostgroup = prepare_hostgroup_for_dns_rebuild(host)
-    Nic::Managed.any_instance.expects(:rebuild_dns).never
-    Host::Managed.any_instance.stubs(:skip_orchestration?).returns(false)
-    put :update, {:commit => "Update", :id => host.id,
-                  :host => {
-                      :name => 'mytest',
-                      :hostgroup_id => hostgroup.id,
-                  }
-    }, set_session_user_default_manager
+    as_default_manager do
+      host = Host::Discovered.import_host(@facts)
+      hostgroup = prepare_hostgroup_for_dns_rebuild(host)
+      Nic::Managed.any_instance.expects(:rebuild_dns).never
+      Host::Managed.any_instance.stubs(:skip_orchestration?).returns(false)
+      put :update, {:commit => "Update", :id => host.id,
+                    :host => {
+        :name => 'mytest',
+        :hostgroup_id => hostgroup.id,
+      }
+      }, set_session_user(User.current)
+    end
   end
 
   def test_dns_rebuild
-    host = prepare_host_for_dns_rebuild
-    hostgroup = prepare_hostgroup_for_dns_rebuild(host)
-    Nic::Managed.any_instance.expects(:rebuild_dns)
-    Host::Managed.any_instance.stubs(:skip_orchestration?).returns(false)
-    put :update, {:commit => "Update", :id => host.id,
-                  :host => {
-                      :name => 'mytest',
-                      :hostgroup_id => hostgroup.id,
-                  }
-    }, set_session_user_default_manager
+    as_default_manager do
+      host = prepare_host_for_dns_rebuild
+      hostgroup = prepare_hostgroup_for_dns_rebuild(host)
+      Nic::Managed.any_instance.expects(:rebuild_dns)
+      Host::Managed.any_instance.stubs(:skip_orchestration?).returns(false)
+      put :update, {:commit => "Update", :id => host.id,
+                    :host => {
+        :name => 'mytest',
+        :hostgroup_id => hostgroup.id,
+      }
+      }, set_session_user(User.current)
+    end
   end
 
   def test_dns_rebuild_with_auto_provision
-    host = prepare_host_for_dns_rebuild
-    hostgroup = prepare_hostgroup_for_dns_rebuild(host)
-    Nic::Managed.any_instance.expects(:rebuild_dns)
-    Host::Managed.any_instance.stubs(:skip_orchestration?).returns(false)
-    FactoryGirl.create(:discovery_rule, :priority => 1, :search => "name = mytest.myorchdomain.net", :hostgroup_id => hostgroup.id, :organizations => [host.organization], :locations => [host.location])
-    post :auto_provision, { :id => host.id }, set_session_user_default_manager
+    as_default_manager do
+      host = prepare_host_for_dns_rebuild
+      hostgroup = prepare_hostgroup_for_dns_rebuild(host)
+      Nic::Managed.any_instance.expects(:rebuild_dns)
+      Host::Managed.any_instance.stubs(:skip_orchestration?).returns(false)
+      FactoryGirl.create(:discovery_rule, :priority => 1, :search => "name = mytest.myorchdomain.net", :hostgroup_id => hostgroup.id, :organizations => [host.organization], :locations => [host.location])
+      post :auto_provision, { :id => host.id }, set_session_user(User.current)
+    end
   end
 
   private