foreman_ansible 6.0.2 → 6.3.1

data/locale/nl_NL/foreman_ansible.po

@@ -13,7 +13,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_ansible 5.0.1\n"
+"Project-Id-Version: foreman_ansible 3.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2018-11-14 21:36+0000\n"
 "Last-Translator: dschutterop <daniel@schutterop.nl>, 2019\n"

data/locale/pl/foreman_ansible.po

@@ -9,7 +9,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_ansible 5.0.1\n"
+"Project-Id-Version: foreman_ansible 3.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2018-11-14 21:36+0000\n"
 "Last-Translator: Michał Foryt <michal.foryt@gmail.com>, 2019\n"

data/locale/pt_BR/foreman_ansible.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_ansible 5.0.1\n"
+"Project-Id-Version: foreman_ansible 3.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2018-03-12 12:24-0400\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

data/locale/ru/foreman_ansible.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_ansible 5.0.1\n"
+"Project-Id-Version: foreman_ansible 3.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2018-03-12 12:24-0400\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

data/locale/sv_SE/foreman_ansible.po

@@ -10,7 +10,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_ansible 5.0.1\n"
+"Project-Id-Version: foreman_ansible 3.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2018-11-14 21:36+0000\n"
 "Last-Translator: johnny.westerlund <johnny.westerlund@gmail.com>, 2019\n"

data/locale/zh_CN/foreman_ansible.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_ansible 5.0.1\n"
+"Project-Id-Version: foreman_ansible 3.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2018-03-12 12:24-0400\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

data/locale/zh_TW/foreman_ansible.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_ansible 5.0.1\n"
+"Project-Id-Version: foreman_ansible 3.0.2\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2018-03-12 12:24-0400\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

data/package.json

@@ -7,33 +7,24 @@
     "test": "test"
   },
   "peerDependencies": {
-    "@theforeman/vendor": ">= 3.3.2"
+    "@theforeman/vendor": ">= 6.0.0"
   },
   "dependencies": {
     "react-json-tree": "^0.11.0"
   },
   "devDependencies": {
     "@babel/core": "^7.7.0",
-    "@theforeman/builder": "^4.0.2",
-    "@theforeman/vendor-dev": "^3.3.2",
-    "babel-eslint": "^10.0.0",
-    "babel-jest": "^24.9.0",
-    "enzyme": "^3.7.0",
-    "enzyme-adapter-react-16": "^1.7.0",
-    "enzyme-to-json": "^3.3.5",
-    "eslint": "^6.0.0",
-    "eslint-plugin-patternfly-react": "^0.2.1",
-    "identity-obj-proxy": "^3.0.0",
-    "jest": "^24.9.0",
-    "prettier": "^1.19.0",
-    "react-redux": "^5.0.7",
-    "react-redux-test-utils": "^0.1.1",
-    "redux": "^3.7.2",
-    "redux-thunk": "^2.3.0"
+    "@theforeman/builder": "^6.0.0",
+    "@theforeman/eslint-plugin-foreman": "6.0.0",
+    "@theforeman/test": "^6.0.0",
+    "@theforeman/vendor-dev": "^6.0.0",
+    "babel-eslint": "^10.0.3",
+    "eslint": "^6.7.2",
+    "prettier": "^1.13.5"
   },
   "scripts": {
-    "test": "node node_modules/.bin/jest webpack",
-    "lint": "eslint ./webpack"
+    "test": "tfm-test --plugin",
+    "lint": "tfm-lint --plugin -d webpack"
   },
   "repository": {
     "type": "git",
@@ -44,27 +35,5 @@
   "bugs": {
     "url": "https://projects.theforeman.org/projects/ansible"
   },
-  "homepage": "https://theforeman.org/plugins/foreman_ansible/",
-  "jest": {
-    "verbose": true,
-    "moduleDirectories": [
-      "node_modules/@theforeman/vendor-core/node_modules",
-      "node_modules",
-      "webpack"
-    ],
-    "transform": {
-      "^.+\\.js$": "babel-jest"
-    },
-    "setupFiles": [
-      "raf/polyfill",
-      "./webpack/test_setup.js"
-    ],
-    "testPathIgnorePatterns": [
-      "/node_modules/",
-      "<rootDir>/foreman/"
-    ],
-    "moduleNameMapper": {
-      "^.+\\.(css|scss)$": "identity-obj-proxy"
-    }
-  }
+  "homepage": "https://theforeman.org/plugins/foreman_ansible/"
 }

data/test/factories/ansible_roles.rb

@@ -4,4 +4,16 @@ FactoryBot.define do
   factory :ansible_role do
     sequence(:name) { |n| "ansible_role_#{n}" }
   end
+
+  factory :host_ansible_role do
+    position { nil }
+    host
+    ansible_role
+  end
+
+  factory :hostgroup_ansible_role do
+    position { nil }
+    hostgroup
+    ansible_role
+  end
 end

data/test/factories/host_ansible_enhancements.rb

@@ -0,0 +1,23 @@
+FactoryBot.modify do
+  factory :host do
+    trait :with_ansible_roles do
+      transient do
+        roles_count { 2 }
+      end
+      after(:build) do |host, evaluator|
+        host.host_ansible_roles = FactoryBot.build_list(:host_ansible_role, evaluator.roles_count, host: host)
+      end
+    end
+  end
+
+  factory :hostgroup do
+    trait :with_ansible_roles do
+      transient do
+        roles_count { 2 }
+      end
+      after(:build) do |hostgroup, evaluator|
+        hostgroup.hostgroup_ansible_roles = FactoryBot.build_list(:hostgroup_ansible_role, evaluator.roles_count, hostgroup: hostgroup)
+      end
+    end
+  end
+end

data/test/foreman_ansible/helpers/ansible_roles_helper_test.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'test_plugin_helper'
+
+class AnsibleRolesHelperTest < ActiveSupport::TestCase
+  include ForemanAnsible::AnsibleRolesHelper
+
+  describe '#role_attributes_for_roles_switcher' do
+    let(:hg_with_roles) { FactoryBot.create(:hostgroup, :with_ansible_roles) }
+
+    context 'with hostgroup' do
+      let(:child) { FactoryBot.build(:hostgroup, :with_ansible_roles, parent: hg_with_roles) }
+
+      it 'show inherited and positioned own roles' do
+        role_attributes = role_attributes_for_roles_switcher(child)
+        expected_ids = hg_with_roles.ansible_roles.pluck(:id) + child.hostgroup_ansible_roles.map(&:ansible_role_id)
+        assert_equal(expected_ids, role_attributes.map { |ra| ra[:id] })
+      end
+
+      it 'includes inherited roles just once' do
+        child.host_ansible_roles << FactoryBot.build(:hostgroup_ansible_role, hostgroup: child, ansible_role: hg_with_roles.ansible_roles.first)
+        role_attributes = role_attributes_for_roles_switcher(child)
+        expected_ids = hg_with_roles.ansible_roles.pluck(:id) + child.hostgroup_ansible_roles.map(&:ansible_role_id)
+        assert_equal(expected_ids.uniq, role_attributes.map { |ra| ra[:id] })
+      end
+    end
+
+    context 'with host' do
+      let(:host_new) { FactoryBot.build(:host, :with_ansible_roles, hostgroup: hg_with_roles) }
+
+      it 'show inherited and positioned own roles' do
+        role_attributes = role_attributes_for_roles_switcher(host_new)
+        expected_ids = hg_with_roles.ansible_roles.pluck(:id) + host_new.host_ansible_roles.map(&:ansible_role_id)
+        assert_equal(expected_ids, role_attributes.map { |ra| ra[:id] })
+      end
+
+      it 'includes inherited roles just once' do
+        host_new.host_ansible_roles << FactoryBot.build(:host_ansible_role, host: host_new, ansible_role: hg_with_roles.ansible_roles.first)
+        role_attributes = role_attributes_for_roles_switcher(host_new)
+        expected_ids = hg_with_roles.ansible_roles.pluck(:id) + host_new.host_ansible_roles.map(&:ansible_role_id)
+        assert_equal(expected_ids.uniq, role_attributes.map { |ra| ra[:id] })
+      end
+    end
+  end
+end

data/test/functional/ansible_variables_controller_test.rb

@@ -34,21 +34,6 @@ class AnsibleVariablesControllerTest < ActionController::TestCase
     assert_redirected_to ansible_variables_url
   end
 
-  test 'should show import page' do
-    ForemanAnsible::UiRolesImporter.any_instance.
-      expects(:import_role_names).returns({})
-
-    ForemanAnsible::VariablesImporter.any_instance.
-      expects(:import_variable_names).returns({
-        :obsolete => [@model]
-      })
-
-    get :import,
-        :params => { :proxy => @proxy.id },
-        :session => set_session_user
-    assert_response :success
-  end
-
   test 'should create ansible variable' do
     params = { :ansible_variable => { :key => 'great name', :ansible_role_id => FactoryBot.create(:ansible_role).id } }
     assert_difference('AnsibleVariable.count', 1) do

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

@@ -45,7 +45,30 @@ module Api
           }, :session => set_session_user
           assert_response :success
         end
+
         test 'should fetch' do
+          @controller = Api::V2::AnsibleRolesController.new
+          @controller.stubs(:prepare_ansible_import_rows).returns(
+            [{
+              :name => 'test_user.test_name',
+              :id => nil,
+              :role_action => 'Import Role',
+              :variables => 'Add: 7',
+              :hosts_count => '',
+              :hostgroup_count => '',
+              :kind => 'new'
+            },
+             {
+               :name => 'some_user.some_role',
+               :id => nil,
+               :role_action => 'Import Role',
+               :variables => 'Add: 3',
+               :hosts_count => '',
+               :hostgroup_count => '',
+               :kind => 'new'
+             }]
+          )
+
           get :fetch, :params => {
             :proxy_id => @proxy.id
           }, :session => set_session_user

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

@@ -9,6 +9,7 @@ module Api
     class HostgroupsControllerTest < ActionController::TestCase
       setup do
         @ansible_role1 = FactoryBot.create(:ansible_role)
+        @ansible_role2 = FactoryBot.create(:ansible_role)
         @host1 = FactoryBot.create(:host, :with_hostgroup)
         @host2 = FactoryBot.create(:host, :with_hostgroup)
         @host3 = FactoryBot.create(:host, :with_hostgroup)
@@ -44,23 +45,23 @@ module Api
       end
 
       test 'should list ansible roles for a host group' do
-        @host3.hostgroup.ansible_roles = [@ansible_role1]
+        FactoryBot.create(:hostgroup_ansible_role, hostgroup_id: @host3.hostgroup.id, ansible_role_id: @ansible_role1.id, position: 0)
         get :ansible_roles, :params => { :id => @host3.hostgroup.id }
         response = JSON.parse(@response.body)
         assert_equal @ansible_role1.id, response.first['id']
       end
 
-      test 'should assign a role to a hostgroup' do
+      test 'should assign a role to a hostgroup with a correct ordering' do
         hostgroup = FactoryBot.create(:hostgroup,
                                       :ansible_role_ids => [])
         post :assign_ansible_roles,
              :params => {
                :id => hostgroup.id,
-               :ansible_role_ids => [@ansible_role1.id]
+               :ansible_role_ids => [@ansible_role2.id, @ansible_role1.id]
              },
              :session => set_session_user
         assert_response :success
-        assert assigns('hostgroup').ansible_roles, [@ansible_role1]
+        assert_equal assigns('hostgroup').ansible_roles, [@ansible_role2, @ansible_role1]
       end
     end
   end

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

@@ -53,9 +53,9 @@ module Api
       end
 
       test 'should update a host with ansible_role_ids param' do
-        host = FactoryBot.create(:host,
-                                 :managed => false,
-                                 :ansible_role_ids => [@ansible_role1.id])
+        host = FactoryBot.create(:host, :managed => false)
+        FactoryBot.create(:host_ansible_role, :host_id => host.id, :ansible_role_id => @ansible_role1.id, :position => 0)
+
         post :update,
              :params => {
                :id => host.id,
@@ -63,28 +63,29 @@ module Api
              },
              :session => set_session_user
         assert_response :success
-        assert assigns('host').ansible_roles, [@ansible_role2]
+        host.reload
+        assert_equal host.ansible_roles, [@ansible_role2]
       end
 
       test 'should list ansible roles for a host' do
-        @host3.ansible_roles = [@ansible_role1]
+        FactoryBot.create(:host_ansible_role, :host_id => @host3.id, :ansible_role_id => @ansible_role1.id, :position => 0)
         get :ansible_roles, :params => { :id => @host3.id }
         response = JSON.parse(@response.body)
         assert_equal @ansible_role1.id, response.first['id']
       end
 
-      test 'should assign a role to a host' do
+      test 'should assign a role to a host with a correct ordering' do
         host = FactoryBot.create(:host,
                                  :managed => false,
                                  :ansible_role_ids => [])
         post :assign_ansible_roles,
              :params => {
                :id => host.id,
-               :ansible_role_ids => [@ansible_role1.id]
+               :ansible_role_ids => [@ansible_role2.id, @ansible_role1.id]
              },
              :session => set_session_user
         assert_response :success
-        assert assigns('host').ansible_roles, [@ansible_role1]
+        assert_equal assigns('host').ansible_roles, [@ansible_role2, @ansible_role1]
       end
     end
   end

data/test/functional/hosts_controller_test.rb

@@ -16,7 +16,9 @@ class HostsControllerExtensionsTest < ActionController::TestCase
     test 'create a host with ansible roles' do
       host = { :name => 'foo',
                :managed => false,
-               :ansible_role_ids => [@role.id] }
+               :host_ansible_roles_attributes => {
+                 0 => { :ansible_role_id => @role.id, :position => 0 }
+               } }
       post :create, :params => { :host => host }, :session => set_session_user
       assert_redirected_to host_url(assigns('host'))
       assert assigns('host').ansible_roles, [@role]
@@ -27,17 +29,19 @@ class HostsControllerExtensionsTest < ActionController::TestCase
       post :update,
            :params => {
              :id => host.id,
-             :host => { :ansible_role_ids => [@role.id] }
+             :host => { :host_ansible_roles_attributes => {
+               0 => { :ansible_role_id => @role.id, :position => 0 }
+             } }
            },
            :session => set_session_user
       assert_redirected_to host_url(assigns('host'))
-      assert assigns('host').ansible_roles, [@role]
+      assert_equal assigns('host').ansible_roles, [@role]
     end
 
     test 'delete a host with ansible roles' do
-      host = FactoryBot.create(:host,
-                               :managed => false,
-                               :ansible_roles => [@role])
+      host = FactoryBot.create(:host, :managed => false)
+      FactoryBot.create(:host_ansible_role, host_id: host.id, ansible_role_id: @role.id, position: 0)
+
       assert_include @role.hosts, host
       delete :destroy,
              :params => { :id => host.id },

data/test/unit/concerns/host_managed_extensions_test.rb

@@ -9,8 +9,8 @@ class HostManagedExtensionsTest < ActiveSupport::TestCase
     @role2 = FactoryBot.create(:ansible_role)
     @role3 = FactoryBot.create(:ansible_role)
 
-    @hostgroup_parent = FactoryBot.create(:hostgroup,
-                                          :ansible_roles => [@role2])
+    @hostgroup_parent = FactoryBot.create(:hostgroup)
+    FactoryBot.create(:hostgroup_ansible_role, hostgroup_id: @hostgroup_parent.id, ansible_role_id: @role2.id)
     @hostgroup = FactoryBot.create(:hostgroup, :parent => @hostgroup_parent)
     @host = FactoryBot.build_stubbed(:host, :ansible_roles => [@role1])
     @another_host = FactoryBot.build_stubbed(:host, :ansible_roles => [@role3])
@@ -23,7 +23,7 @@ class HostManagedExtensionsTest < ActiveSupport::TestCase
 
     test 'returns assigned and inherited roles for host with a hostgroup' do
       @host.hostgroup = @hostgroup
-      @host.all_ansible_roles.must_equal [@role1, @role2]
+      @host.all_ansible_roles.must_equal [@role2, @role1]
     end
   end
 
@@ -48,4 +48,18 @@ class HostManagedExtensionsTest < ActiveSupport::TestCase
       assert Host::Managed.import_host('192.168.128.27').new_record?
     end
   end
+
+  test 'should correctly order roles for host' do
+    host = FactoryBot.create(:host)
+    FactoryBot.create(:host_ansible_role, :ansible_role_id => @role1.id, :position => 1, :host_id => host.id)
+    FactoryBot.create(:host_ansible_role, :ansible_role_id => @role2.id, :position => 2, :host_id => host.id)
+    FactoryBot.create(:host_ansible_role, :ansible_role_id => @role3.id, :position => 0, :host_id => host.id)
+    host.ansible_roles.must_equal [@role3, @role1, @role2]
+  end
+
+  test 'should order hostgroup roles before host roles' do
+    host = FactoryBot.create(:host, :hostgroup => @hostgroup)
+    FactoryBot.create(:host_ansible_role, :ansible_role_id => @role1.id, :position => 0, :host_id => host.id)
+    host.all_ansible_roles.must_equal [@role2, @role1]
+  end
 end