Merge remote-tracking branch 'upstream/master' into doc/readme

Author: rlue

.rubocop_rspec_base.yml

@@ -1,4 +1,4 @@
-# This file was generated on 2018-04-03T19:49:13+10:00 from the rspec-dev repo.
+# This file was generated on 2018-12-30T16:45:57+00:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 # This file contains defaults for RSpec projects. Individual projects

.travis.yml

@@ -23,7 +23,7 @@ cache: bundler
 bundler_args: "--binstubs --path ../bundle --retry=3 --jobs=3"
 
 before_install:
-  - gem update --system
+  - gem update --system 2.7.8
   - gem install bundler
   - script/clone_all_rspec_repos
 

Changelog.md

@@ -5,6 +5,14 @@ Bug Fixes:
 
 * Fix issue with generator for preview specs where `Mailer` would be duplicated
   in the name. (Kohei Sugi, #2037)
+* Fix the request spec generator to handle namespaced files. (Kohei Sugi, #2057)
+* Further truncate system test filenames to handle cases when extra words are
+  prepended. (Takumi Kaji, #2058)
+
+Enhancements
+
+* Use `__dir__` instead of `__FILE__` in generated `rails_helper.rb` where
+  supported. (OKURA Masafumi, #2048)
 
 ### 3.8.1 / 2018-10-23
 [Full Changelog](http://github.com/rspec/rspec-rails/compare/v3.8.0...v3.8.1)

appveyor.yml

@@ -1,4 +1,4 @@
-# This file was generated on 2018-04-03T19:49:13+10:00 from the rspec-dev repo.
+# This file was generated on 2018-12-30T16:45:57+00:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 version: "{build}"
@@ -33,7 +33,6 @@ test_script:
 
 environment:
   matrix:
-    - ruby_version: 193
     - ruby_version: 200
     - ruby_version: 21
     - ruby_version: 22

features/system_specs/system_specs.feature

@@ -1,13 +1,28 @@
 Feature: System spec
 
     System specs are RSpec's wrapper around Rails' own
-    [system tests](http://guides.rubyonrails.org/testing.html#system-testing).
-    We encourage you to familiarize yourself with their documentation.
+    [system tests](https://guides.rubyonrails.org/testing.html#system-testing).
 
-    RSpec **does not** use your `ApplicationSystemTestCase` helper. Instead it uses
-    the default `driven_by(:selenium)` from Rails. If you want to override this
-    behaviour you can call `driven_by` manually in a test.
+    > System tests allow you to test user interactions with your application,
+    > running tests in either a real or a headless browser. System tests use
+    > Capybara under the hood.
+    >
+    > By default, system tests are run with the Selenium driver, using the
+    > Chrome browser, and a screen size of 1400x1400. The next section explains
+    > how to change the default settings.
 
+    System specs are marked by setting type to :system, e.g. `:type => :system`.
+
+    The Capybara gem is automatically required, and Rails includes it in
+    generated application Gemfiles. Configure a webserver (e.g.
+    `Capybara.server = :webrick`) before attempting to use system specs.
+
+    RSpec **does not** use your `ApplicationSystemTestCase` helper. Instead it
+    uses the default `driven_by(:selenium)` from Rails. If you want to override
+    this behaviour you can call `driven_by` manually in a test.
+
+    System specs run in a transaction. So unlike feature specs with
+    javascript, you do not need [DatabaseCleaner](https://github.com/DatabaseCleaner/database_cleaner).
 
     @system_test
     Scenario: System specs

lib/generators/rspec/install/templates/spec/rails_helper.rb

@@ -1,7 +1,11 @@
 # This file is copied to spec/ when you run 'rails generate rspec:install'
 require 'spec_helper'
 ENV['RAILS_ENV'] ||= 'test'
+<% if RUBY_VERSION >= '2.0.0' %>
+require File.expand_path('../config/environment', __dir__)
+<% else %>
 require File.expand_path('../../config/environment', __FILE__)
+<% end %>
 # Prevent database truncation if the environment is production
 abort("The Rails environment is running in production mode!") if Rails.env.production?
 require 'rspec/rails'

lib/generators/rspec/integration/integration_generator.rb

@@ -15,7 +15,7 @@ def generate_request_spec
         return unless options[:request_specs]
 
         template 'request_spec.rb',
-                 File.join('spec/requests', class_path, "#{table_name}_spec.rb")
+                 File.join('spec/requests', "#{name.underscore.pluralize}_spec.rb")
       end
     end
   end

lib/generators/rspec/integration/templates/request_spec.rb

@@ -1,7 +1,7 @@
 require 'rails_helper'
 
 RSpec.describe "<%= class_name.pluralize %>", <%= type_metatag(:request) %> do
-  describe "GET /<%= table_name %>" do
+  describe "GET /<%= name.underscore.pluralize %>" do
     it "works! (now write some real specs)" do
       get <%= index_helper %>_path
       expect(response).to have_http_status(200)

lib/rspec/rails/example/system_example_group.rb

@@ -37,7 +37,7 @@ def method_name
         @method_name ||= [
           self.class.name.underscore,
           RSpec.current_example.description.underscore
-        ].join("_").tr(CHARS_TO_TRANSLATE.join, "_")[0...251] + "_#{rand(1000)}"
+        ].join("_").tr(CHARS_TO_TRANSLATE.join, "_")[0...200] + "_#{rand(1000)}"
       end
 
       # Delegates to `Rails.application`.
@@ -57,7 +57,7 @@ def app
             System test integration requires Rails >= 5.1 and has a hard
             dependency on a webserver and `capybara`, please add capybara to
             your Gemfile and configure a webserver (e.g. `Capybara.server =
-            :webrick`) before attempting to use system tests.
+            :webrick`) before attempting to use system specs.
           """.gsub(/\s+/, ' ').strip
         end
 

script/clone_all_rspec_repos

@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2018-04-03T19:49:13+10:00 from the rspec-dev repo.
+# This file was generated on 2018-12-30T16:45:57+00:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 set -e

script/functions.sh

@@ -1,4 +1,4 @@
-# This file was generated on 2018-04-03T19:49:13+10:00 from the rspec-dev repo.
+# This file was generated on 2018-12-30T16:45:57+00:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

script/predicate_functions.sh

@@ -1,4 +1,4 @@
-# This file was generated on 2018-04-03T19:49:13+10:00 from the rspec-dev repo.
+# This file was generated on 2018-12-30T16:45:57+00:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 function is_mri {

script/run_build

@@ -1,5 +1,5 @@
 #!/bin/bash
-# This file was generated on 2018-04-03T19:49:13+10:00 from the rspec-dev repo.
+# This file was generated on 2018-12-30T16:45:57+00:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 set -e

script/travis_functions.sh

@@ -1,4 +1,4 @@
-# This file was generated on 2018-04-03T19:49:13+10:00 from the rspec-dev repo.
+# This file was generated on 2018-12-30T16:45:57+00:00 from the rspec-dev repo.
 # DO NOT modify it by hand as your changes will get lost the next time it is generated.
 
 # Taken from:

spec/support/generators.rb

@@ -34,32 +34,65 @@ def self.included(klass)
 
           describe 'generated with no flags' do
             before do
-              run_generator %w(posts)
+              run_generator name
             end
 
-            subject(:request_spec) { file('spec/requests/posts_spec.rb') }
+            subject(:request_spec) { file(spec_file_name) }
 
-            it "creates the request spec" do
-              expect(request_spec).to exist
-            end
+            context 'When NAME=posts' do
+              let(:name) { %w(posts) }
+              let(:spec_file_name) { 'spec/requests/posts_spec.rb' }
 
-            it "the generator requires 'rails_helper'" do
-              expect(request_spec).to contain(/require 'rails_helper'/)
-            end
+              it "creates the request spec" do
+                expect(request_spec).to exist
+              end
 
-            it "the generator describes the provided NAME without monkey " \
-               "patching setting the type to `:request`" do
-              expect(request_spec).to contain(
-                /^RSpec.describe \"Posts\", #{type_metatag(:request)}/
-              )
-            end
+              it "the generator requires 'rails_helper'" do
+                expect(request_spec).to contain(/require 'rails_helper'/)
+              end
+
+              it "the generator describes the provided NAME without monkey " \
+                 "patching setting the type to `:request`" do
+                expect(request_spec).to contain(
+                  /^RSpec.describe \"Posts\", #{type_metatag(:request)}/
+                )
+              end
+
+              it "the generator includes a sample GET request" do
+                expect(request_spec).to contain(/describe "GET \/posts"/)
+              end
 
-            it "the generator includes a sample GET request" do
-              expect(request_spec).to contain(/describe "GET \/posts"/)
+              it "the generator sends the GET request to the index path" do
+                expect(request_spec).to contain(/get posts_index_path/)
+              end
             end
 
-            it "the generator sends the GET request to the index path" do
-              expect(request_spec).to contain(/get posts_index_path/)
+            context 'When NAME=api/posts' do
+              let(:name) { %w(api/posts) }
+              let(:spec_file_name) { 'spec/requests/api/posts_spec.rb' }
+
+              it "creates the request spec" do
+                expect(request_spec).to exist
+              end
+
+              it "the generator requires 'rails_helper'" do
+                expect(request_spec).to contain(/require 'rails_helper'/)
+              end
+
+              it "the generator describes the provided NAME without monkey " \
+                 "patching setting the type to `:request`" do
+                expect(request_spec).to contain(
+                  /^RSpec.describe \"Api::Posts\", #{type_metatag(:request)}/
+                )
+              end
+
+              it "the generator includes a sample GET request" do
+                expect(request_spec).to contain(/describe "GET \/api\/posts\"/)
+              end
+
+              it "the generator sends the GET request to the index path" do
+                expect(request_spec).to contain(/get api_posts_index_path\n/)
+              end
             end
           end
         end