Skip to content

PDB-307 Fix private method rspec failures due to mocha 1.0.0 upgrade#798

Merged
senior merged 2 commits intopuppetlabs:1.5.xfrom
kbarber:ticket/1.5.x/PDB-307-fix_private_method_rspec_failures
Jan 14, 2014
Merged

PDB-307 Fix private method rspec failures due to mocha 1.0.0 upgrade#798
senior merged 2 commits intopuppetlabs:1.5.xfrom
kbarber:ticket/1.5.x/PDB-307-fix_private_method_rspec_failures

Conversation

@kbarber
Copy link
Contributor

@kbarber kbarber commented Jan 14, 2014

This patch fixes an rspec failure we were having on the terminus due to the
recent bump from mocha from 0.14.1 to 1.0.0.

Previously mocha seems to have been ignoring private method calls for whatever
reason. With the new version of mocha it is throwing exceptions (as it rightly
should).

This patch removes the use of the private declaration and converts all of
these methods to be document @api private in YARD instead migrating a
language enforcement to a documentation enforcement instead.

As an aside I noticed that char_encoding.rb had a 3 space indent convention,
this has been converted to 2 space as per our standard.

Signed-off-by: Ken Barber ken@bob.sh

This patch fixes an rspec failure we were having on the terminus due to the
recent bump from mocha from 0.14.1 to 1.0.0.

Previously mocha seems to have been ignoring private method calls for whatever
reason. With the new version of mocha it is throwing exceptions (as it rightly
should).

This patch removes the use of the `private` declaration and converts all of
these methods to be document `@api private` in YARD instead migrating a
language enforcement to a documentation enforcement instead.

As an aside I noticed that char_encoding.rb had a 3 space indent convention,
this has been converted to 2 space as per our standard.

Signed-off-by: Ken Barber <ken@bob.sh>
This patch moves the jenkins rspec build script into our git repository to
be called by jenkins instead of loading up the full script in the job itself.

Signed-off-by: Ken Barber <ken@bob.sh>
@puppetlabs-jenkins
Copy link
Contributor

💚 Test passed.
Refer to this link for build results: https://jenkins.puppetlabs.com/job/PuppetDB%20Acceptance%20-%20Pull%20Requests/149/

@puppetlabs-jenkins
Copy link
Contributor

💚 Test passed.
Refer to this link for build results: https://jenkins.puppetlabs.com/job/PuppetDB%20Acceptance%20-%20Pull%20Requests/150/

senior added a commit that referenced this pull request Jan 14, 2014
…_method_rspec_failures

PDB-307 Fix private method rspec failures due to mocha 1.0.0 upgrade
@senior senior merged commit cf08f1f into puppetlabs:1.5.x Jan 14, 2014
@puppetcla
Copy link

CLA signed by all contributors.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants