foreman_salt 11.0.0 → 11.0.1

data/locale/foreman_salt.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foreman_salt 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-04-29 18:38+0000\n"
-"PO-Revision-Date: 2019-04-29 18:38+0000\n"
+"POT-Creation-Date: 2019-07-22 19:13+0000\n"
+"PO-Revision-Date: 2019-07-22 19:13+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -163,6 +163,19 @@ msgstr ""
 msgid "Could not find salt environment with id %s"
 msgstr ""
 
+#: ../app/controllers/foreman_salt/concerns/hosts_controller_extensions.rb:44
+#: ../app/helpers/concerns/foreman_salt/hosts_helper_extensions.rb:38
+msgid "Salt Master"
+msgstr ""
+
+#: ../app/controllers/foreman_salt/concerns/hosts_controller_extensions.rb:54
+msgid "No salt environment selected!"
+msgstr ""
+
+#: ../app/controllers/foreman_salt/concerns/hosts_controller_extensions.rb:68
+msgid "Updated hosts: changed salt environment"
+msgstr ""
+
 #: ../app/controllers/foreman_salt/minions_controller.rb:24
 msgid "Unable to generate output, Check log files\\n"
 msgstr ""
@@ -213,19 +226,25 @@ msgstr ""
 msgid "Salt external nodes YAML dump"
 msgstr ""
 
-#: ../app/helpers/concerns/foreman_salt/hosts_helper_extensions.rb:16
+#: ../app/helpers/concerns/foreman_salt/hosts_helper_extensions.rb:17
+#: ../lib/foreman_salt/plugin.rb:156
 msgid "Run Salt"
 msgstr ""
 
-#: ../app/helpers/concerns/foreman_salt/hosts_helper_extensions.rb:17
+#: ../app/helpers/concerns/foreman_salt/hosts_helper_extensions.rb:18
 msgid "Trigger a state.highstate run on a node"
 msgstr ""
 
-#: ../app/helpers/concerns/foreman_salt/hosts_helper_extensions.rb:27
-msgid "Salt Master"
+#: ../app/helpers/concerns/foreman_salt/hosts_helper_extensions.rb:29
+msgid "Change Salt Master"
 msgstr ""
 
-#: ../app/helpers/concerns/foreman_salt/hosts_helper_extensions.rb:28
+#: ../app/helpers/concerns/foreman_salt/hosts_helper_extensions.rb:30
+msgid "Change Salt Environment"
+msgstr ""
+
+#: ../app/helpers/concerns/foreman_salt/hosts_helper_extensions.rb:39
+#: ../app/views/hosts/select_multiple_salt_environment.html.erb:7
 msgid "Salt Environment"
 msgstr ""
 
@@ -340,7 +359,11 @@ msgstr ""
 msgid "Namespace Foreman pillars under 'foreman' key"
 msgstr ""
 
-#: ../app/services/foreman_salt/report_importer.rb:7
+#: ../app/models/setting/salt.rb:8
+msgid "Hide the Run Salt state.highstate button on the host details page"
+msgstr ""
+
+#: ../app/services/foreman_salt/report_importer.rb:8
 msgid "Invalid report"
 msgstr ""
 
@@ -520,6 +543,18 @@ msgstr ""
 msgid "Edit"
 msgstr ""
 
+#: ../app/views/hosts/select_multiple_salt_environment.html.erb:4
+msgid "Select salt environment"
+msgstr ""
+
+#: ../app/views/hosts/select_multiple_salt_environment.html.erb:5
+msgid "*Clear environment*"
+msgstr ""
+
+#: ../lib/foreman_salt/plugin.rb:152
+msgid "Run Salt state.highstate"
+msgstr ""
+
 #: action_names.rb:2
 msgid "Action with sub plans"
 msgstr ""

data/test/integration/hosts_js_test.rb

@@ -39,7 +39,7 @@ module ForemanSalt
     describe "hosts index salt multiple actions" do
       test 'change salt master action' do
         visit hosts_path
-        page.find('#check_all').trigger('click')
+        check 'check_all'
 
         # Ensure and wait for all hosts to be checked, and that no unchecked hosts remain
         assert page.has_no_selector?('input.host_select_boxes:not(:checked)')
@@ -50,7 +50,7 @@ module ForemanSalt
         assert multiple_actions_div.find('ul').visible?
 
         # Hosts are added to cookie
-        host_ids_on_cookie = JSON.parse(CGI.unescape(page.driver.cookies['_ForemanSelectedhosts'].value))
+        host_ids_on_cookie = JSON.parse(CGI.unescape(get_me_the_cookie('_ForemanSelectedhosts')&.fetch(:value)))
         assert(host_ids_on_cookie.include?(@host.id))
 
         within('#submit_multiple') do
@@ -63,12 +63,12 @@ module ForemanSalt
         # remove hosts cookie on submit
         index_modal.find('.btn-primary').click
         assert_current_path hosts_path
-        assert_empty(page.driver.cookies['_ForemanSelectedhosts'])
+        assert_empty(get_me_the_cookie('_ForemanSelectedhosts'))
       end
 
       test 'change salt environment action' do
         visit hosts_path
-        page.find('#check_all').trigger('click')
+        check 'check_all'
 
         # Ensure and wait for all hosts to be checked, and that no unchecked hosts remain
         assert page.has_no_selector?('input.host_select_boxes:not(:checked)')
@@ -79,7 +79,7 @@ module ForemanSalt
         assert multiple_actions_div.find('ul').visible?
 
         # Hosts are added to cookie
-        host_ids_on_cookie = JSON.parse(CGI.unescape(page.driver.cookies['_ForemanSelectedhosts'].value))
+        host_ids_on_cookie = JSON.parse(CGI.unescape(get_me_the_cookie('_ForemanSelectedhosts')&.fetch(:value)))
         assert(host_ids_on_cookie.include?(@host.id))
 
         within('#submit_multiple') do
@@ -92,7 +92,7 @@ module ForemanSalt
         # remove hosts cookie on submit
         index_modal.find('.btn-primary').click
         assert_current_path hosts_path
-        assert_empty(page.driver.cookies['_ForemanSelectedhosts'])
+        assert_empty(get_me_the_cookie('_ForemanSelectedhosts'))
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_salt
 version: !ruby/object:Gem::Version
-  version: 11.0.0
+  version: 11.0.1
 platform: ruby
 authors:
 - Stephen Benjamin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-20 00:00:00.000000000 Z
+date: 2019-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.71.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.71.0
 description: Foreman Plug-in for Salt
 email:
 - stephen@redhat.com
@@ -153,9 +167,14 @@ files:
 - lib/tasks/foreman_salt_tasks.rake
 - locale/Makefile
 - locale/action_names.rb
+- locale/de/LC_MESSAGES/foreman_salt.mo
 - locale/de/foreman_salt.edit.po
 - locale/de/foreman_salt.po
+- locale/de/foreman_salt.po.time_stamp
+- locale/en/LC_MESSAGES/foreman_salt.mo
+- locale/en/foreman_salt.edit.po
 - locale/en/foreman_salt.po
+- locale/en/foreman_salt.po.time_stamp
 - locale/foreman_salt.pot
 - test/factories/foreman_salt_factories.rb
 - test/functional/api/v2/salt_autosign_controller_test.rb