HomePhorge

Merge remote-tracking branch 'upstream/pr/3442'
755610678b34Unpublished

Unpublished Commit ยท Learn More

Repository Importing: This repository is still importing.

Description

Merge remote-tracking branch 'upstream/pr/3442'

  • upstream/pr/3442: (30 commits) (PUP-3912) Remove orphaned stubs (temporarily made doubles by transpec) (PUP-3912) Revert transpec's replacement of unstub (PUP-3912) Split a compound expectation into two separate expect's (PUP-3912) Revert transpec's use of double (PUP-3912) Fix up some recent changes for rspec 3 (PUP-3912) Update parallel:spec task for rspec 3 (PUP-3912) Remove spec for loading features from disk (PUP-3912) Remove unused method (PUP-3912) Update to use expected_as_array in rspec 3 (PUP-3912) Rewrite have_resource matcher for rspec 3 (PUP-3912) Remove unused respond_to? method (PUP-3912) Uncomment the test body for two pending tests (PUP-3912) Remove a pending line as the issue is now fixed (PUP-3912) Replace conditional pending blocks (PUP-3912) Update use of pending to skip (PUP-3912) Rewrite expect to use: not_to raise_error (PUP-3912) Change 'describe' blocks to 'context' blocks (PUP-3912) Replace 'double' with 'stub' for rspec 3 (PUP-3912) Fix a use of 'subject' in an after hook (PUP-3912) Remove spec test for previously removed code ...

Event Timeline

Josh Cooper <josh@puppetlabs.com> committed rPU755610678b34: Merge remote-tracking branch 'upstream/pr/3442' (authored by Josh Cooper <josh@puppetlabs.com>).Jan 26 2015, 8:54 PM

Merged Changes