Please review pull request #66: (#6717) Fix dependent destroy tests opened by (mmrobins)
Description:
I accidentally ran the spec suite on while in detached HEAD, so didn't
notice that the branch I had done a pull request on had test failures.
The database now handles the deletion of dependent records, not the
ActiveRecord models.
- Opened: Tue Nov 22 04:29:57 UTC 2011
- Based on: puppetlabs:master (981995d5d36eb7313dd57929205ef7439b3cce0e)
- Requested merge: mmrobins:ticket/master/6717_table_cleanup (f981ca23f57d64255b3a488b92d03661d607be32)
Diff follows:
diff --git a/spec/models/node_spec.rb b/spec/models/node_spec.rb index 2804f4f..e6d87dc 100644 --- a/spec/models/node_spec.rb +++ b/spec/models/node_spec.rb @@ -436,12 +436,6 @@ describe Node do @node = Node.generate!(:name => 'gonnadienode') end - it("should destroy dependent reports") do - @report = Report.generate!(:host => @node.name) - @node.destroy - Report.all.should_not include(@report) - end - it "should remove class memberships" do node_class = NodeClass.generate!() @node.node_classes << node_class diff --git a/spec/models/report_spec.rb b/spec/models/report_spec.rb index eab6300..82ff931 100644 --- a/spec/models/report_spec.rb +++ b/spec/models/report_spec.rb @@ -452,25 +452,6 @@ describe Report do end end - - describe "When destroying" do - it "should destroy all dependent model objects" do - @node = Node.generate(:name => 'puppet.puppetlabs.vm') - @report_yaml = File.read(File.join(RAILS_ROOT, "spec/fixtures/reports/puppet26/report_ok_service_started_ok.yaml")) - file = '/etc/puppet/manifests/site.pp' - report = Report.create_from_yaml(@report_yaml) - ResourceStatus.count.should_not == 0 - ResourceEvent.count.should_not == 0 - ReportLog.count.should_not == 0 - Metric.count.should_not == 0 - report.destroy - ResourceStatus.count.should == 0 - ResourceEvent.count.should == 0 - ReportLog.count.should == 0 - Metric.count.should == 0 - end - end - describe "when submitting reports" do it "should be able to save an inspect report and an apply report with the same timestamp" do time = Time.now
--
You received this message because you are subscribed to the Google Groups "Puppet Developers" group.
To post to this group, send email to puppet-dev@googlegroups.com.
To unsubscribe from this group, send email to puppet-dev+unsubscr...@googlegroups.com.
For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.