Enable remaining disabled Rubocop rules and fix violations

.rubocop.yml

@@ -1,5 +1,3 @@
-inherit_from:
-  - .rubocop_todo.yml
 AllCops:
   Exclude:
     - 'tmp/**/*'

app/models/world_location.rb

@@ -13,9 +13,10 @@ def self.reset_cache
 
   def self.all
     cache_fetch("all") do
-      Services.worldwide_api.world_locations.with_subsequent_pages.map do |l|
+      world_locations = Services.worldwide_api.world_locations.with_subsequent_pages.map do |l|
         new(l) if l.format == "World location" && l.details && l.details.slug.present?
-      end.compact
+      end
+      world_locations.compact
     end
   end
 

app/presenters/flow_registration_presenter.rb

@@ -33,7 +33,7 @@ def description
 
   module MethodMissingHelper
     def method_missing(method, *_args, &_block)
-      MethodMissingObject.new(method, parent_method = nil, blank_to_s = true)
+      MethodMissingObject.new(method, nil, true)
     end
   end
 

doc/rubocop.md

@@ -4,15 +4,7 @@ We're using the `govuk-lint` Gem to include Rubocop and the GOV.UK styleguide ru
 
 ### Jenkins
 
-We run `govuk-lint-ruby` as part of the test suite executed on Jenkins (see jenkins.sh). Behind the scenes this runs Rubocop with a set of cops defined in the `govuk-lint` gem. However, because `govuk-lint` was retro-fitted to the application relatively recently, there were a large number of cop violations in the codebase.
-
-We've dealt with this by generating a project-specific `.rubocop_todo.yml` file using `govuk-lint-ruby --auto-gen-config --exclude-limit 99999` which [excludes existing violations on a per-cop basis][1]. The limit was set to `99999` to minimise the number of cops that are disabled entirely - most are only disabled for a specific set of files.
-
-The generated `.rubocop_todo.yml` file is included into the configuration via a local `.rubocop.yml` file using an `inherit_from` key. This means that the exclusions in `.rubocop_todo.yml` are used for all `govuk-lint-ruby` commands by default. Note that the `.rubocop.yml` file does not override the cop definitions in the `govuk-lint` gem - it is merely a way to add extra configuration.
-
-Using this approach should prevent us from introducing new violations into the project without needing to fix all the existing violations first. However, in the long run, the idea is for us to gradually remove these exclusions to bring the project fully in line with the default `govuk-lint-ruby` configuration. Ultimately we will be able to remove the `.rubocop_todo.yml` & `.rubocop.yml` files and just rely on the default `govuk-lint` configuration.
-
-Note that as per the header comment in  `.rubocop_todo.yml`, changes in the inspected code, or installation of new versions of RuboCop, may require `.rubocop_todo.yml` to be generated again.
+We run `govuk-lint-ruby` as part of the test suite executed on Jenkins (see jenkins.sh). Behind the scenes this runs Rubocop with a set of cops defined in the `govuk-lint` gem.
 
 ### Running locally
 
@@ -33,5 +25,3 @@ Testing for violations in code staged and committed locally that's not present i
 ```bash
 $ govuk-lint-ruby --diff --cached
 ```
-
-[1]: https://github.com/bbatsov/rubocop/blob/master/README.md#automatically-generated-configuration

lib/friendly_time_diff.rb

@@ -42,9 +42,10 @@ def whole_months_away
 
     def month_difference
       m = 0
-      begin
+      loop do
         m += 1
-      end while (from_date >> m) <= to_date
+        break unless (from_date >> m) <= to_date
+      end
       m - 1
     end