Skip to content

Commit 15df8b9

Browse files
committed
PR comments:
*disable Style/Semicolon cop inline *Update documentation *Remove useless deletion from travis script
1 parent db40c8d commit 15df8b9

File tree

5 files changed

+6
-8
lines changed

5 files changed

+6
-8
lines changed

.rubocop.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -323,9 +323,6 @@ Style/RedundantParentheses:
323323
Style/RescueStandardError:
324324
Enabled: false
325325

326-
Style/Semicolon:
327-
Enabled: false
328-
329326
# We haven't adopted the `fail` to signal exceptions vs `raise` for re-raises convention.
330327
Style/SignalException:
331328
Enabled: false

BUILD_DETAIL.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,15 @@ $ bin/yard doc --no-cache
9999

100100
## Rubocop
101101

102-
We use [Rubocop](https://github.com/bbatsov/rubocop) to enforce style conventions on the project so
102+
We use [Rubocop](https://github.com/rubocop-hq/rubocop) to enforce style conventions on the project so
103103
that the code has stylistic consistency throughout. Run with:
104104

105105
```
106-
$ bundle exec rubocop lib
106+
$ bundle exec rubocop
107107
108108
# or, if you installed your bundle with `--standalone --binstubs`:
109109
110-
$ bin/rubocop lib
110+
$ bin/rubocop
111111
```
112112

113113
Our Rubocop configuration is a work-in-progress, so if you get a failure

DEVELOPMENT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ Here's a short, non-exhaustive checklist of things we typically ask contributors
108108
- [ ] New behavior is covered by tests and all tests are passing.
109109
- [ ] No Ruby warnings are issued by your changes.
110110
- [ ] Documentation reflects changes and renders as intended.
111-
- [ ] Rubocop passes (e.g. `bundle exec rubocop lib`).
111+
- [ ] Rubocop passes (e.g. `bundle exec rubocop`).
112112
- [ ] Commits are squashed into a reasonable number of logical changesets that tell an easy-to-follow story.
113113
- [ ] No changelog entry is necessary (we'll add it as part of the merge process!)
114114

script/after_update_travis_build.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,3 @@ echo "Restoring custom Travis config"
55
mv .travis.yml{.update_backup,}
66

77
echo "Removing Base rubocop, Rspec-Rails does not use it"
8-
rm '.rubocop_rspec_base.yml'

spec/rspec/rails/active_model_spec.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
end
1717

1818
it 'allows you to stub instances of `ActiveModel`' do
19+
# rubocop:disable Style/Semicolon
1920
klass = Class.new { include ActiveModel::AttributeMethods; attr_accessor :name }
21+
# rubocop:enable Style/Semicolon
2022
model = klass.new
2123
allow(model).to receive(:name) { 'stubbed name' }
2224
expect(model.name).to eq 'stubbed name'

0 commit comments

Comments
 (0)