Merge pull request #34 from Workday/FixJenkinsPlugin

JenkinsPlugin not saving project level settings
Workday · Mar 12, 2019 · 48283ec · 48283ec
2 parents c064e0d + 92b1f76
commit 48283ec
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
@@ -66,14 +66,15 @@ def destroy
 
   def save_plugin_settings(settings, enabled_plugins)
     return if settings.blank?
-    settings.each do |setting|
-      settings_hash = settings[setting]
-      settings_hash[:enabled] = if enabled_plugins.blank?
-                                  false
-                                else
-                                  enabled_plugins[setting] == 'true'
-                                end
-      @project.plugin_settings[setting] = settings_hash
+    PluginManager.instance.for_project(@project).plugins_hash.each do |plugin|
+      plugin_key = plugin.first
+      plugin_settings_hash = settings[plugin_key] || {}
+      plugin_settings_hash[:enabled] = if enabled_plugins.blank?
+                                         false
+                                       else
+                                         enabled_plugins[plugin_key] == 'true'
+                                       end
+      @project.plugin_settings[plugin_key] = plugin_settings_hash
     end
   end
 

diff --git a/app/plugins/bamboo_plugin.rb b/app/plugins/bamboo_plugin.rb
@@ -66,7 +66,7 @@ def comment_on_build(build)
     response
   end
 
-  # Add bammboo url from project plugin settings
+  # Add bamboo url from project plugin settings
   # Params:
   # - project: project to look for plugin settings
   def get_base_bamboo_url(project)

diff --git a/secrets.yml.enc b/secrets.yml.enc
diff --git a/test/plugins/jenkins_plugin_test.rb b/test/plugins/jenkins_plugin_test.rb
@@ -10,6 +10,7 @@ def setup
     @build.save
 
     @jenkins_plugin = JenkinsPlugin.new(@unique_id)
+    @project_settings_hash = @build.project.plugin_settings
   end
 
   test 'verify hook calls update description' do
@@ -23,4 +24,8 @@ def setup
     plugin_manager = PluginManager.instance.for_project(@build.project)
     assert_not_nil(plugin_manager.plugins_hash[@unique_id])
   end
+
+  test 'jenkins plugin disabled' do
+    assert_equal(false, @project_settings_hash[@jenkins_plugin.unique_id][:enabled])
+  end
 end