Merge pull request zendesk#644 from zendesk/grosser/fix

fix duplicate id issues when copying flowdock or slack

app/models/stage.rb

@@ -37,7 +37,7 @@ def self.reorder(new_order)
   def self.build_clone(old_stage)
     new(old_stage.attributes.except("id")).tap do |new_stage|
       Samson::Hooks.fire(:stage_clone, old_stage, new_stage)
-      new_stage.new_relic_applications.build(old_stage.new_relic_applications.map { |app| app.attributes.except("id") })
+      new_stage.new_relic_applications.build(old_stage.new_relic_applications.map { |app| app.attributes.except("id", "updated_at", "created_at") })
       new_stage.command_ids = old_stage.command_ids
     end
   end

plugins/flowdock/lib/samson_flowdock/samson_plugin.rb

@@ -7,7 +7,7 @@ class Engine < Rails::Engine
 Samson::Hooks.view :deploy_view, 'samson_flowdock/notify_buddy_box'
 
 Samson::Hooks.callback :stage_clone do |old_stage, new_stage|
-  new_stage.flowdock_flows.build(old_stage.flowdock_flows.map(&:attributes))
+  new_stage.flowdock_flows.build(old_stage.flowdock_flows.map { |f| f.attributes.except("id", "created_at", "updated_at") })
 end
 
 Samson::Hooks.callback :stage_permitted_params do

plugins/flowdock/test/models/hooks_test.rb

@@ -29,4 +29,13 @@
       Samson::Hooks.fire(:after_deploy, deploy, nil)
     end
   end
+
+  describe :stage_clone do
+    it "copies all attributes except id" do
+      stage.flowdock_flows << FlowdockFlow.new(name: "test", token: "abcxyz", enabled: false)
+      new_stage = Stage.new
+      Samson::Hooks.fire(:stage_clone, stage, new_stage)
+      new_stage.flowdock_flows.map(&:attributes).must_equal [{"id"=>nil, "name"=>"test", "token"=>"abcxyz", "stage_id"=>nil, "created_at"=>nil, "updated_at"=>nil, "enabled"=>false}]
+    end
+  end
 end

plugins/slack/db/migrate/20150331084621_create_slack_channels.rb

@@ -9,6 +9,5 @@ def change
     end
 
     add_index :slack_channels, :stage_id
-
   end
 end

plugins/slack/lib/samson_slack/samson_plugin.rb

@@ -7,7 +7,7 @@ class Engine < Rails::Engine
 Samson::Hooks.view :stage_form, "samson_slack/fields"
 
 Samson::Hooks.callback :stage_clone do |old_stage, new_stage|
-  new_stage.slack_channels.build(old_stage.slack_channels.map(&:attributes))
+  new_stage.slack_channels.build(old_stage.slack_channels.map { |s| s.attributes.except("id", "created_at", "updated_at") })
 end
 
 Samson::Hooks.callback :stage_permitted_params do

plugins/slack/test/models/hooks_test.rb

@@ -29,4 +29,13 @@
       Samson::Hooks.fire(:after_deploy, deploy, nil)
     end
   end
+
+  describe :stage_clone do
+    it "copies all attributes except id" do
+      stage.slack_channels << SlackChannel.new(channel_id: 1, name: 'channel1')
+      new_stage = Stage.new
+      Samson::Hooks.fire(:stage_clone, stage, new_stage)
+      new_stage.slack_channels.map(&:attributes).must_equal [{"id"=>nil, "name"=>"channel1", "channel_id"=>"1", "stage_id"=>nil, "created_at"=>nil, "updated_at"=>nil}]
+    end
+  end
 end

test/models/stage_test.rb

@@ -371,11 +371,6 @@
       @clone.id.wont_equal subject.id
     end
 
-    it "copies over the flowdock flows" do
-      assert_equal @clone.flowdock_flows.map { |f| f.attributes.except("stage_id") },
-        subject.flowdock_flows.map { |f| f.attributes.except("stage_id") }
-    end
-
     it "copies over the new relic applications" do
       assert_equal @clone.new_relic_applications.map { |n| n.attributes.except("stage_id", "id") },
         subject.new_relic_applications.map { |n| n.attributes.except("stage_id", "id") }