rubocop: features/step_definitions.rb #4956

Merged
merged 2 commits into from Jun 3, 2016

Conversation

Projects
None yet
5 participants
@ayastreb
Contributor

ayastreb commented May 27, 2016

Fixes in features/step_definitions.rb
#4885

@@ -14,24 +14,24 @@
#
-Given %r{^I have a blank site in "(.*)"$} do |path|
- if !File.exist?(path)
+Given(/^I have a blank site in "(.*)"$/) do |path|

This comment has been minimized.

@envygeeks

envygeeks May 27, 2016

Contributor

This should still fail, we use %r!! over // or %r{}.

@envygeeks

envygeeks May 27, 2016

Contributor

This should still fail, we use %r!! over // or %r{}.

This comment has been minimized.

@ayastreb

ayastreb May 27, 2016

Contributor

Hm, actually it failed with %r!!, I guess because we have following in .rubocop.yml

Style/RegexpLiteral:
  EnforcedStyle: slashes

Should I change it to percent_r ?

@ayastreb

ayastreb May 27, 2016

Contributor

Hm, actually it failed with %r!!, I guess because we have following in .rubocop.yml

Style/RegexpLiteral:
  EnforcedStyle: slashes

Should I change it to percent_r ?

This comment has been minimized.

@envygeeks

envygeeks May 27, 2016

Contributor

I'll digress to @parkr but we've been moving to %r!! all over the place.

@envygeeks

envygeeks May 27, 2016

Contributor

I'll digress to @parkr but we've been moving to %r!! all over the place.

This comment has been minimized.

@pathawks

pathawks May 27, 2016

Member

Only when there is a literal / in the regex

@pathawks

pathawks May 27, 2016

Member

Only when there is a literal / in the regex

This comment has been minimized.

@pathawks

pathawks May 27, 2016

Member

Which is to say, /test/ is fine, but /test\// is ugly so in that case we use %r!test/! instead.

@pathawks

pathawks May 27, 2016

Member

Which is to say, /test/ is fine, but /test\// is ugly so in that case we use %r!test/! instead.

features/step_definitions.rb
- else
- {}
- end
+ SafeYAML.load_file(source_dir.join("_config.yml"))

This comment has been minimized.

@envygeeks

envygeeks May 27, 2016

Contributor

That's over tabbed and breaks readability, no matter what Rubocop tries to tell you and because it's not customizable more in this aspect we do:

val = \
  if blah
    work(
      here
    )
  end
@envygeeks

envygeeks May 27, 2016

Contributor

That's over tabbed and breaks readability, no matter what Rubocop tries to tell you and because it's not customizable more in this aspect we do:

val = \
  if blah
    work(
      here
    )
  end
@envygeeks

This comment has been minimized.

Show comment
Hide comment
@envygeeks

envygeeks May 27, 2016

Contributor

Thanks! Just a few comments.

Contributor

envygeeks commented May 27, 2016

Thanks! Just a few comments.

@pathawks

This comment has been minimized.

Show comment
Hide comment
@pathawks

pathawks May 27, 2016

Member

LGTM :shipit:

Member

pathawks commented May 27, 2016

LGTM :shipit:

@envygeeks envygeeks added the shipit label May 27, 2016

@parkr

This comment has been minimized.

Show comment
Hide comment
@parkr

parkr Jun 3, 2016

Member

Thank you so much!

@jekyllbot: merge +dev

Member

parkr commented Jun 3, 2016

Thank you so much!

@jekyllbot: merge +dev

@jekyllbot jekyllbot merged commit 5e30823 into jekyll:master Jun 3, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

jekyllbot added a commit that referenced this pull request Jun 3, 2016

@ayastreb ayastreb deleted the ayastreb:step_definitions branch Jun 3, 2016

@parkr parkr referenced this pull request Jun 15, 2016

Closed

Make jekyll/jekyll code compliant with rubocop rules #4885

114 of 115 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment