Skip to content

Commit

Permalink
Merge pull request #40 from site-prism/release/v3_4_2
Browse files Browse the repository at this point in the history
Release/v3 4 2
  • Loading branch information
luke-hill authored Jan 30, 2020
2 parents 63459bd + 7ba461b commit a7a5731
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 15 deletions.
10 changes: 0 additions & 10 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,6 @@ Style/TrailingCommaInArrayLiteral:
Style/AccessModifierDeclarations:
Enabled: false

# Probably need to look into this, see if we can optimise it down the line
Metrics/ModuleLength:
Exclude:
- 'lib/site_prism/dsl.rb'

# Stylistic preference to make the RSpec tests flow better
RSpec/MessageSpies:
EnforcedStyle: receive

# This allows one level of nesting inside `shared_examples`
# This is broken currently!
RSpec/NestedGroups:
Max: 5
16 changes: 15 additions & 1 deletion .rubocop_todo.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,21 @@
# This configuration was generated by
# `rubocop --auto-gen-config`
# on 2020-01-14 10:33:46 +0100 using RuboCop version 0.75.1.
# on 2020-01-30 16:46:32 +0100 using RuboCop version 0.75.1.
# The point is for the user to remove these configuration records
# one by one as the offenses are removed from the code base.
# Note that changes in the inspected code, or installation of new
# versions of RuboCop, may require this file to be generated again.

# Offense count: 1
# Configuration parameters: CountComments.
Metrics/ClassLength:
Max: 116

# Offense count: 1
# Configuration parameters: CountComments.
Metrics/ModuleLength:
Max: 204

# Offense count: 2
RSpec/AnyInstance:
Exclude:
Expand All @@ -15,3 +25,7 @@ RSpec/AnyInstance:
# Configuration parameters: AggregateFailuresByDefault.
RSpec/MultipleExpectations:
Max: 4

# Offense count: 6
RSpec/NestedGroups:
Max: 5
13 changes: 12 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
## [Unreleased]
### Removed

### Added

### Changed

### Fixed

## [3.4.2] - 2020-01-30
### Added
- Simplecov now triggers for both local and CI builds
([luke-hill])
Expand All @@ -21,6 +28,9 @@
- All versions up to `< 1` are permitted to future-proof it against further tweaks
([luke-hill])

- v13 of `rake` can now be used
([luke-hill])

### Fixed
- Fixed up some RSpec cop offenses & Added reasons for rule definitions
([luke-hill])
Expand Down Expand Up @@ -986,7 +996,8 @@ impending major rubocop release
- First release!

<!-- Releases -->
[Unreleased]: https://github.com/site-prism/site_prism/compare/v3.4.1...master
[Unreleased]: https://github.com/site-prism/site_prism/compare/v3.4.2...master
[3.4.2]: https://github.com/site-prism/site_prism/compare/v3.4.1...v3.4.2
[3.4.1]: https://github.com/site-prism/site_prism/compare/v3.4...v3.4.1
[3.4]: https://github.com/site-prism/site_prism/compare/v3.3...v3.4
[3.3]: https://github.com/site-prism/site_prism/compare/v3.2...v3.3
Expand Down
2 changes: 0 additions & 2 deletions lib/site_prism/page.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
require 'site_prism/loadable'

module SitePrism
# rubocop:disable Metrics/ClassLength
class Page
include Capybara::DSL
include ElementChecker
Expand Down Expand Up @@ -167,5 +166,4 @@ def load_html_website(html, &block)
end
end
end
# rubocop:enable Metrics/ClassLength
end
2 changes: 1 addition & 1 deletion site_prism.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Gem::Specification.new do |s|
s.add_dependency 'site_prism-all_there', ['>= 0.3.1', '< 1.0']

s.add_development_dependency 'cucumber', ['~> 3.1']
s.add_development_dependency 'rake', ['~> 12.3']
s.add_development_dependency 'rake', ['>= 12.3']
s.add_development_dependency 'rspec', ['~> 3.8']
s.add_development_dependency 'rubocop', ['~> 0.75.0']
s.add_development_dependency 'rubocop-performance', ['~> 1.5.1']
Expand Down

0 comments on commit a7a5731

Please sign in to comment.