From dc2ff4db448c6e7bc69e287dae54ccb2c2ae3813 Mon Sep 17 00:00:00 2001 From: Phil Pirozhkov Date: Sat, 14 Aug 2021 16:04:10 +0300 Subject: [PATCH 1/2] Fix markup --- docs/modules/ROOT/pages/upgrade_to_version_2.adoc | 2 +- docs/modules/ROOT/pages/usage.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/modules/ROOT/pages/upgrade_to_version_2.adoc b/docs/modules/ROOT/pages/upgrade_to_version_2.adoc index 25c967f32..35c140751 100644 --- a/docs/modules/ROOT/pages/upgrade_to_version_2.adoc +++ b/docs/modules/ROOT/pages/upgrade_to_version_2.adoc @@ -91,7 +91,7 @@ RSpec/FactoryBot: - property/factories/**/*.rb ---- -NOTE: Please keep in mind that `Include`’s merge mode is set to override the default settings, so if you intend to add a path while keeping the default paths, you should include the default `Include` paths in your configuration. +NOTE: Please keep in mind that merge mode for `Include` is set to override the default settings, so if you intend to add a path while keeping the default paths, you should include the default `Include` paths in your configuration. https://github.com/rubocop/rubocop-rspec/pull/1063[Learn more about this change]. diff --git a/docs/modules/ROOT/pages/usage.adoc b/docs/modules/ROOT/pages/usage.adoc index 68fe6386e..dd381a687 100644 --- a/docs/modules/ROOT/pages/usage.adoc +++ b/docs/modules/ROOT/pages/usage.adoc @@ -114,4 +114,4 @@ RSpec: - '**/*_test.rb' ---- -NOTE: Please keep in mind that `Include`’s merge mode is set to override the default settings, so if you intend to add a path while keeping the default paths, you should include the default `Include` paths in your configuration. +NOTE: Please keep in mind that merge mode for `Include` is set to override the default settings, so if you intend to add a path while keeping the default paths, you should include the default `Include` paths in your configuration. From d3970a34cfdf77a34f318d249c83fe4bdaa28041 Mon Sep 17 00:00:00 2001 From: Phil Pirozhkov Date: Sat, 14 Aug 2021 16:55:13 +0300 Subject: [PATCH 2/2] Fix broken sub-department cops links --- docs/modules/ROOT/nav.adoc | 6 ++--- docs/modules/ROOT/pages/cops.adoc | 22 +++++++++---------- ...capybara.adoc => cops_rspec_capybara.adoc} | 0 ...orybot.adoc => cops_rspec_factorybot.adoc} | 0 .../rails.adoc => cops_rspec_rails.adoc} | 0 5 files changed, 14 insertions(+), 14 deletions(-) rename docs/modules/ROOT/pages/{cops_rspec/capybara.adoc => cops_rspec_capybara.adoc} (100%) rename docs/modules/ROOT/pages/{cops_rspec/factorybot.adoc => cops_rspec_factorybot.adoc} (100%) rename docs/modules/ROOT/pages/{cops_rspec/rails.adoc => cops_rspec_rails.adoc} (100%) diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc index 9c5402ead..b50d714f8 100644 --- a/docs/modules/ROOT/nav.adoc +++ b/docs/modules/ROOT/nav.adoc @@ -5,7 +5,7 @@ * xref:upgrade_to_version_2.adoc[Upgrade to 2.x] * xref:third_party_rspec_syntax_extensions.adoc[RSpec syntax extensions in third-party gems] * Cops Documentation -** xref:cops_rspec/capybara.adoc[Capybara] -** xref:cops_rspec/factorybot.adoc[FactoryBot] -** xref:cops_rspec/rails.adoc[Rails] +** xref:cops_rspec_capybara.adoc[Capybara] +** xref:cops_rspec_factorybot.adoc[FactoryBot] +** xref:cops_rspec_rails.adoc[Rails] ** xref:cops_rspec.adoc[RSpec] diff --git a/docs/modules/ROOT/pages/cops.adoc b/docs/modules/ROOT/pages/cops.adoc index b7ba529f0..dcda9d795 100644 --- a/docs/modules/ROOT/pages/cops.adoc +++ b/docs/modules/ROOT/pages/cops.adoc @@ -85,21 +85,21 @@ * xref:cops_rspec.adoc#rspecvoidexpect[RSpec/VoidExpect] * xref:cops_rspec.adoc#rspecyield[RSpec/Yield] -=== Department xref:cops_rspec/capybara.adoc[RSpec/Capybara] +=== Department xref:cops_rspec_capybara.adoc[RSpec/Capybara] -* xref:cops_rspec/capybara.adoc#rspeccapybara/currentpathexpectation[RSpec/Capybara/CurrentPathExpectation] -* xref:cops_rspec/capybara.adoc#rspeccapybara/featuremethods[RSpec/Capybara/FeatureMethods] -* xref:cops_rspec/capybara.adoc#rspeccapybara/visibilitymatcher[RSpec/Capybara/VisibilityMatcher] +* xref:cops_rspec_capybara.adoc#rspeccapybara/currentpathexpectation[RSpec/Capybara/CurrentPathExpectation] +* xref:cops_rspec_capybara.adoc#rspeccapybara/featuremethods[RSpec/Capybara/FeatureMethods] +* xref:cops_rspec_capybara.adoc#rspeccapybara/visibilitymatcher[RSpec/Capybara/VisibilityMatcher] -=== Department xref:cops_rspec/factorybot.adoc[RSpec/FactoryBot] +=== Department xref:cops_rspec_factorybot.adoc[RSpec/FactoryBot] -* xref:cops_rspec/factorybot.adoc#rspecfactorybot/attributedefinedstatically[RSpec/FactoryBot/AttributeDefinedStatically] -* xref:cops_rspec/factorybot.adoc#rspecfactorybot/createlist[RSpec/FactoryBot/CreateList] -* xref:cops_rspec/factorybot.adoc#rspecfactorybot/factoryclassname[RSpec/FactoryBot/FactoryClassName] +* xref:cops_rspec_factorybot.adoc#rspecfactorybot/attributedefinedstatically[RSpec/FactoryBot/AttributeDefinedStatically] +* xref:cops_rspec_factorybot.adoc#rspecfactorybot/createlist[RSpec/FactoryBot/CreateList] +* xref:cops_rspec_factorybot.adoc#rspecfactorybot/factoryclassname[RSpec/FactoryBot/FactoryClassName] -=== Department xref:cops_rspec/rails.adoc[RSpec/Rails] +=== Department xref:cops_rspec_rails.adoc[RSpec/Rails] -* xref:cops_rspec/rails.adoc#rspecrails/avoidsetuphook[RSpec/Rails/AvoidSetupHook] -* xref:cops_rspec/rails.adoc#rspecrails/httpstatus[RSpec/Rails/HttpStatus] +* xref:cops_rspec_rails.adoc#rspecrails/avoidsetuphook[RSpec/Rails/AvoidSetupHook] +* xref:cops_rspec_rails.adoc#rspecrails/httpstatus[RSpec/Rails/HttpStatus] // END_COP_LIST diff --git a/docs/modules/ROOT/pages/cops_rspec/capybara.adoc b/docs/modules/ROOT/pages/cops_rspec_capybara.adoc similarity index 100% rename from docs/modules/ROOT/pages/cops_rspec/capybara.adoc rename to docs/modules/ROOT/pages/cops_rspec_capybara.adoc diff --git a/docs/modules/ROOT/pages/cops_rspec/factorybot.adoc b/docs/modules/ROOT/pages/cops_rspec_factorybot.adoc similarity index 100% rename from docs/modules/ROOT/pages/cops_rspec/factorybot.adoc rename to docs/modules/ROOT/pages/cops_rspec_factorybot.adoc diff --git a/docs/modules/ROOT/pages/cops_rspec/rails.adoc b/docs/modules/ROOT/pages/cops_rspec_rails.adoc similarity index 100% rename from docs/modules/ROOT/pages/cops_rspec/rails.adoc rename to docs/modules/ROOT/pages/cops_rspec_rails.adoc