Update env var to have CYPRESS_RAILS prefix and set default of CYPRESS_RAILS_CYPRESS_DIR to be same value as rails_dir attribute

Author: dmanliclic715

README.md

@@ -156,7 +156,7 @@ preferred environment variables project-wide using a tool like
 
 
 * **CYPRESS_RAILS_DIR** (default: `Dir.pwd`) the directory of your Rails project
-* **CYPRESS_DIR** (default: `Dir.pwd`) the directory of your Cypress project
+* **CYPRESS_RAILS_CYPRESS_DIR** (default: _same value as `rails_dir`_) the directory of your Cypress project
 * **CYPRESS_RAILS_HOST** (default: `"127.0.0.1"`) the hostname to bind to
 * **CYPRESS_RAILS_PORT** (default: _a random available port_) the port to run
   the Rails test server on

lib/cypress-rails/config.rb

@@ -6,7 +6,7 @@ class Config
 
     def initialize(
       rails_dir: Env.fetch("CYPRESS_RAILS_DIR", default: Dir.pwd),
-      cypress_dir: Env.fetch("CYPRESS_DIR", default: Dir.pwd),
+      cypress_dir: Env.fetch("CYPRESS_RAILS_CYPRESS_DIR", default: rails_dir),
       host: Env.fetch("CYPRESS_RAILS_HOST", default: "127.0.0.1"),
       port: Env.fetch("CYPRESS_RAILS_PORT"),
       base_path: Env.fetch("CYPRESS_RAILS_BASE_PATH", default: "/"),
@@ -28,7 +28,7 @@ def to_s
         cypress-rails configuration:
         ============================
          CYPRESS_RAILS_DIR.....................#{rails_dir.inspect}
-         CYPRESS_DIR...........................#{cypress_dir.inspect}
+         CYPRESS_RAILS_CYPRESS_DIR.............#{cypress_dir.inspect}
          CYPRESS_RAILS_HOST....................#{host.inspect}
          CYPRESS_RAILS_PORT....................#{port.inspect}
          CYPRESS_RAILS_BASE_PATH...............#{base_path.inspect}

script/test

@@ -15,5 +15,7 @@ echo "---> Running tests"
 bundle exec rake
 ./script/test_example_app
 
+bundle exec rake test
+
 echo "---> Job's done!"
 

test/config_test.rb

@@ -0,0 +1,44 @@
+require_relative "test_helper"
+
+class ConfigTest < Minitest::Test
+  def test_that_rails_dir_and_cypress_dir_use_default_directory
+    config = CypressRails::Config.new
+    expected_directory_path = Dir.pwd
+
+    assert_equal(expected_directory_path, config.rails_dir)
+    assert_equal(expected_directory_path, config.cypress_dir)
+  end
+
+  def test_that_rails_dir_and_cypress_dir_can_be_independently_set
+    mock_env(
+      "CYPRESS_RAILS_DIR" => "path/to/cypress-rails",
+      "CYPRESS_RAILS_CYPRESS_DIR" => "path/to/another/cypress/directory"
+    ) do
+      config = CypressRails::Config.new
+
+      assert_equal("path/to/cypress-rails", config.rails_dir)
+      assert_equal("path/to/another/cypress/directory", config.cypress_dir)
+    end
+  end
+
+  def test_that_cypress_dir_uses_same_directory_as_rails_dir_when_not_set
+    mock_env("CYPRESS_RAILS_DIR" => "path/to/cypress-rails") do
+      config = CypressRails::Config.new
+
+      assert_nil(ENV["CYPRESS_RAILS_CYPRESS_DIR"])
+      assert_equal("path/to/cypress-rails", config.cypress_dir)
+    end
+  end
+
+  private
+
+  def mock_env(partial_env_hash)
+    old = ENV.to_hash
+    ENV.update partial_env_hash
+    begin
+      yield
+    ensure
+      ENV.replace old
+    end
+  end
+end