mocha12
4c91b6589cc0Unpublished
Actions

Unpublished Commit · Learn More

Repository Importing: This repository is still importing.

Description

Merge pull request #1016 from pcarlisle/maint/2.7.x/mocha12

Maint/2.7.x/mocha12

Details

Provenance

pcarlisle <patrick@puppetlabs.com>	Authored on
vanmeeuwen	Pushed on Jun 2 2015, 2:22 PM

Parents

rPUa7d6c3df055e: Add Puppet::Parser::Functions::clear for specs
rPU6db9d5a257c4: Merge branch 'bug/2.7.x/10915-misleading-error-messages' into 2.7.x

Branches

Unknown

Tags

Unknown

Event Timeline

pcarlisle <patrick@puppetlabs.com> committed rPU4c91b6589cc0: Merge pull request #1016 from pcarlisle/maint/2.7.x/mocha12 (authored by pcarlisle <patrick@puppetlabs.com>).Aug 9 2012, 1:26 AM

Merged Changes

a7d6c3df055e Add Puppet::Parser::Functions::clear for specs
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
279c32350417 Clear Environment.current when calling Environment.clear
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
536b68c31ca7 Check that function loading worked correctly.
Author
Daniel Pittman <daniel@puppetlabs.com>
Browse Repository
No Builds
No Audits
abc7885c6d18 Avoid stubbing Thread::new due to issues in newer mocha
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
fdb8ca377051 Rename specs to end in _spec.rb
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
9c361f16979a Don't require mocha in spec_helper
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
6d3d5913e5d4 Fix stubbing on nil in some specs
Author
Patrick Carlisle <patrick@puppetlabs.com>
Browse Repository
No Builds
No Audits
60a6a2a646eb (#14515) Tests fail with mocha 0.11.4
Author
Jeff Weiss <jeff.weiss@puppetlabs.com>
Browse Repository
No Builds
No Audits

Changes (26)

Path

Size

lib/

puppet/

node/

parser/

test/

spec/

integration/

defaults_spec.rb

spec_helper.rb

unit/

application/

queue_spec.rb

face/

instrumentation_data.rb

	instrumentation_data_spec.rb
	instrumentation_data.rb

instrumentation_listener.rb

	instrumentation_listener_spec.rb
	instrumentation_listener.rb

instrumentation_probe.rb

	instrumentation_probe_spec.rb
	instrumentation_probe.rb

network/

http/

node/

parser/

functions/

type/

file/

content_spec.rb

ctime.rb

	ctime_spec.rb
	ctime.rb

mtime.rb

	mtime_spec.rb
	mtime.rb

type.rb

	type_spec.rb
	type.rb

rPU4c91b6589cc0

View Options

lib/puppet/node/environment.rb

View Options

lib/puppet/parser/functions.rb

View Options

lib/puppet/parser/scope.rb

View Options

lib/puppet/test/test_helper.rb

View Options

spec/integration/defaults_spec.rb

View Options

spec/spec_helper.rb

View Options

spec/unit/application/queue_spec.rb

View Options

spec/unit/face/instrumentation_data.rb

View Options

spec/unit/face/instrumentation_data_spec.rb

View Options

spec/unit/face/instrumentation_listener.rb

View Options

spec/unit/face/instrumentation_listener_spec.rb

View Options

spec/unit/face/instrumentation_probe.rb

View Options

spec/unit/face/instrumentation_probe_spec.rb

View Options

spec/unit/network/http/webrick_spec.rb

View Options

spec/unit/node/environment_spec.rb

View Options

spec/unit/parser/collector_spec.rb

View Options

spec/unit/parser/files_spec.rb

View Options

spec/unit/parser/functions/require_spec.rb

View Options

spec/unit/parser/functions/template_spec.rb

View Options

spec/unit/type/file/content_spec.rb

View Options

spec/unit/type/file/ctime.rb

View Options

spec/unit/type/file/ctime_spec.rb

View Options

spec/unit/type/file/mtime.rb

View Options

spec/unit/type/file/mtime_spec.rb

View Options

spec/unit/type/file/type.rb

View Options

spec/unit/type/file/type_spec.rb

Merge pull request #1016 from pcarlisle/maint/2.7.x/mocha124c91b6589cc0UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (26)

rPU4c91b6589cc0

lib/puppet/node/environment.rb

lib/puppet/parser/functions.rb

lib/puppet/parser/scope.rb

lib/puppet/test/test_helper.rb

spec/integration/defaults_spec.rb

spec/spec_helper.rb

spec/unit/application/queue_spec.rb

spec/unit/face/instrumentation_data.rb

spec/unit/face/instrumentation_data_spec.rb

spec/unit/face/instrumentation_listener.rb

spec/unit/face/instrumentation_listener_spec.rb

spec/unit/face/instrumentation_probe.rb

spec/unit/face/instrumentation_probe_spec.rb

spec/unit/network/http/webrick_spec.rb

spec/unit/node/environment_spec.rb

spec/unit/parser/collector_spec.rb

spec/unit/parser/files_spec.rb

spec/unit/parser/functions/require_spec.rb

spec/unit/parser/functions/template_spec.rb

spec/unit/type/file/content_spec.rb

spec/unit/type/file/ctime.rb

spec/unit/type/file/ctime_spec.rb

spec/unit/type/file/mtime.rb

spec/unit/type/file/mtime_spec.rb

spec/unit/type/file/type.rb

spec/unit/type/file/type_spec.rb

Merge pull request #1016 from pcarlisle/maint/2.7.x/mocha12
4c91b6589cc0Unpublished
Actions