Specs structure improvements

Author: blocknotes

Gemfile

@@ -4,3 +4,19 @@ source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 gemspec
+
+group :development, :test do
+  gem 'capybara', '~> 3.33'
+  gem 'database_cleaner-active_record', '~> 1.8'
+  # gem 'factory_bot_rails', '~> 6.1'
+  gem 'mysql2', '~> 0.5'
+  gem 'pg', '~> 1.2'
+  gem 'rspec_junit_formatter', '~> 0.4'
+  gem 'rspec-rails', '~> 4.0'
+  gem 'rubocop', '~> 0.91'
+  gem 'rubocop-rspec', '~> 1.42'
+  gem 'selenium-webdriver', '~> 3.142'
+  gem 'simplecov', '~> 0.18'
+
+  gem 'pry-rails'
+end

Rakefile

@@ -23,12 +23,15 @@ load 'rails/tasks/statistics.rake'
 
 require 'bundler/gem_tasks'
 
-require 'rake/testtask'
+begin
+  require 'rspec/core/rake_task'
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'spec'
-  t.pattern = 'spec/**/*_spec.rb'
-  t.verbose = false
-end
+  RSpec::Core::RakeTask.new(:spec) do |t|
+    # t.ruby_opts = %w[-w]
+    t.rspec_opts = ['--color', '--format documentation']
+  end
 
-task default: :test
+  task default: :spec
+rescue LoadError
+  puts '! LoadError: no RSpec available'
+end

active_storage_db.gemspec

@@ -32,16 +32,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activestorage', '~> 6.0'
   spec.add_dependency 'rails', '~> 6.0'
 
-  spec.add_development_dependency 'capybara', '~> 3.33'
-  spec.add_development_dependency 'database_cleaner-active_record', '~> 1.8'
   spec.add_development_dependency 'factory_bot_rails', '~> 6.1'
-  spec.add_development_dependency 'mysql2', '~> 0.5'
-  spec.add_development_dependency 'pg', '~> 1.2'
-  spec.add_development_dependency 'pry', '~> 0.13'
-  spec.add_development_dependency 'rspec_junit_formatter', '~> 0.4'
-  spec.add_development_dependency 'rspec-rails', '~> 4.0'
-  spec.add_development_dependency 'rubocop', '~> 0.91'
-  spec.add_development_dependency 'rubocop-rspec', '~> 1.42'
-  spec.add_development_dependency 'selenium-webdriver', '~> 3.142'
-  spec.add_development_dependency 'simplecov', '~> 0.18'
 end

bin/rails

@@ -2,14 +2,16 @@
 # This command will automatically be run when you run "rails" with Rails gems
 # installed from the root of your application.
 
+ENV['DB'] ||= 'postgres'
+ENV['RAILS_ENV'] ||= 'test'
+
 ENGINE_ROOT = File.expand_path('..', __dir__)
 ENGINE_PATH = File.expand_path('../lib/active_storage_db/engine', __dir__)
-APP_PATH = File.expand_path('../test/dummy/config/application', __dir__)
+APP_PATH = File.expand_path('../spec/dummy/config/application', __dir__)
 
 # Set up gems listed in the Gemfile.
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
 require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
 
 require 'rails/all'
 require 'rails/engine/commands'
-