Skip to content
This repository was archived by the owner on Mar 8, 2020. It is now read-only.

Trying vcr #11

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open

Trying vcr #11

wants to merge 9 commits into from

Conversation

trevordocherty
Copy link

Resolves #1

Description

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update
  • Documentation update

How Has This Been Tested?

Screenshots

@nihonjinrxs
Copy link
Member

@trevordocherty the failures here are code style failures. To see those locally, you can run

bundle exec rubocop

Here are the failures showing in the CI build log (which you can see by clicking on one of the Details links for the CI builds below or by clicking on the red X next to the commit ID above):

Offenses:
spec/vcr_setup.rb:1:9: C: Style/StringLiterals: Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.
require 'vcr'
        ^^^^^
spec/vcr_setup.rb:4:28: C: Style/StringLiterals: Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.
  c.cassette_library_dir = 'spec/vcr_cassettes'
                           ^^^^^^^^^^^^^^^^^^^^
spec/vcr_setup.rb:8:1: C: Layout/EmptyLines: Extra blank line detected.
spec/vcr_setup.rb:12:34: C: Style/HashSyntax: Use the new Ruby 1.9 hash syntax.
  c.default_cassette_options = { :record => record_mode }
                                 ^^^^^^^^^^
66 files inspected, 4 offenses detected

3 of 4 should be self-explanatory. The last one is asking you to use the { key: value } syntax form of a hash, rather than { :key => value }.

@trevordocherty trevordocherty marked this pull request as ready for review February 27, 2019 06:52
@nihonjinrxs
Copy link
Member

@trevordocherty You've got a merge conflict now. This is likely because I pulled upstream's master branch a bit earlier this evening and things have been updated there.

@nihonjinrxs
Copy link
Member

@trevordocherty that commit modified the Gemfile.lock but didn't actually resolve the merge conflict.

You can look at the merge conflict in Github via the "Resolve conflicts" button. May be worthwhile to do that so you can see exactly what the conflict is.

Also, conflicts are identified like changes in a diff are, set apart by <<<<< and >>>>>. Searching the file for those character strings can help also.

Copy link
Collaborator

@mdworken mdworken left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you un-delete the Gemfile.lock? Looks good besides that I think

@trevordocherty trevordocherty requested a review from mdworken March 12, 2019 22:32
@trevordocherty
Copy link
Author

@mdworken added the file back

@nihonjinrxs
Copy link
Member

@mdworken when you get a chance, can you please review this one?

@nihonjinrxs
Copy link
Member

@trevordocherty you'll need to re-merge master into this branch, as it's out of date.

Copy link
Collaborator

@mdworken mdworken left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like the Gemfile.lock is showing as all deleted then re-added in git. If you'd like I can help you fix this.

Copy link
Author

@trevordocherty trevordocherty left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I fixed it

@trevordocherty trevordocherty requested a review from mdworken March 26, 2019 22:35
@trevordocherty
Copy link
Author

@mdworken can you look at this again?

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[1:1] Setup VCR
3 participants