From 6374490399a136f9e22f226368051fa4d4fb1c98 Mon Sep 17 00:00:00 2001 From: Jon Rowe Date: Mon, 17 Apr 2023 07:57:07 +0100 Subject: [PATCH] Merge pull request #3035 from rspec/remove-relish Remove references to Relish --- Gemfile-custom.sample | 1 - Rakefile | 30 ------------------- .../project_initializer/spec/spec_helper.rb | 2 +- 3 files changed, 1 insertion(+), 32 deletions(-) diff --git a/Gemfile-custom.sample b/Gemfile-custom.sample index 8532039ad6..186a929888 100644 --- a/Gemfile-custom.sample +++ b/Gemfile-custom.sample @@ -1,6 +1,5 @@ group :development do gem 'interactive_rspec' - gem 'relish', '~> 0.6.0' gem 'guard-rspec', '~> 1.2.1' gem 'growl', '1.0.3' gem 'spork', '0.9.0' diff --git a/Rakefile b/Rakefile index 0f30480338..782012af6a 100644 --- a/Rakefile +++ b/Rakefile @@ -43,36 +43,6 @@ task :rdoc do sh "yardoc" end -with_changelog_in_features = lambda do |&block| - begin - sh "cp Changelog.md features/" - block.call - ensure - sh "rm features/Changelog.md" - end -end - -desc "Push docs/cukes to relishapp using the relish-client-gem" -task :relish, :version do |_t, args| - raise "rake relish[VERSION]" unless args[:version] - - with_changelog_in_features.call do - if `relish versions rspec/rspec-core`.split.map(&:strip).include? args[:version] - puts "Version #{args[:version]} already exists" - else - sh "relish versions:add rspec/rspec-core:#{args[:version]}" - end - sh "relish push rspec/rspec-core:#{args[:version]}" - end -end - -desc "Push to relish staging environment" -task :relish_staging do - with_changelog_in_features.call do - sh "relish push rspec-staging/rspec-core" - end -end - task :default => [:spec, :cucumber, :rubocop] task :verify_private_key_present do diff --git a/lib/rspec/core/project_initializer/spec/spec_helper.rb b/lib/rspec/core/project_initializer/spec/spec_helper.rb index 5ae5b6962c..c80d44b974 100644 --- a/lib/rspec/core/project_initializer/spec/spec_helper.rb +++ b/lib/rspec/core/project_initializer/spec/spec_helper.rb @@ -61,7 +61,7 @@ # Limits the available syntax to the non-monkey patched syntax that is # recommended. For more details, see: - # https://relishapp.com/rspec/rspec-core/docs/configuration/zero-monkey-patching-mode + # https://rspec.info/features/3-12/rspec-core/configuration/zero-monkey-patching-mode/ config.disable_monkey_patching! # This setting enables warnings. It's recommended, but in some cases may