Merge rails_helper into spec_helper
The reason some projects have both is so that some spec files can be run in isolation, without the rails stuff. In practice, I don't find myself ever doing this. So, the complexity of two files is unnecessary.
This commit is contained in:
parent
8dae6f66b2
commit
38fa23873c
|
@ -1,4 +1,4 @@
|
||||||
require "rails_helper"
|
require "spec_helper"
|
||||||
|
|
||||||
RSpec.describe ArticlesController, type: :controller do
|
RSpec.describe ArticlesController, type: :controller do
|
||||||
describe "PaperTrail.enabled_for_controller?" do
|
describe "PaperTrail.enabled_for_controller?" do
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require "rails_helper"
|
require "spec_helper"
|
||||||
require "generator_spec/test_case"
|
require "generator_spec/test_case"
|
||||||
require File.expand_path("../../../lib/generators/paper_trail/install_generator", __FILE__)
|
require File.expand_path("../../../lib/generators/paper_trail/install_generator", __FILE__)
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require "rails_helper"
|
require "spec_helper"
|
||||||
|
|
||||||
RSpec.describe Animal, type: :model, versioning: true do
|
RSpec.describe Animal, type: :model, versioning: true do
|
||||||
it "baseline test setup" do
|
it "baseline test setup" do
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require "rails_helper"
|
require "spec_helper"
|
||||||
require "support/custom_json_serializer"
|
require "support/custom_json_serializer"
|
||||||
|
|
||||||
RSpec.describe Boolit, type: :model, versioning: true do
|
RSpec.describe Boolit, type: :model, versioning: true do
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require "rails_helper"
|
require "spec_helper"
|
||||||
|
|
||||||
RSpec.describe CallbackModifier, type: :model, versioning: true do
|
RSpec.describe CallbackModifier, type: :model, versioning: true do
|
||||||
describe "paper_trail_on_destroy" do
|
describe "paper_trail_on_destroy" do
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require "rails_helper"
|
require "spec_helper"
|
||||||
|
|
||||||
RSpec.describe Car, type: :model do
|
RSpec.describe Car, type: :model do
|
||||||
it { is_expected.to be_versioned }
|
it { is_expected.to be_versioned }
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require "rails_helper"
|
require "spec_helper"
|
||||||
|
|
||||||
RSpec.describe CustomPrimaryKeyRecord, type: :model do
|
RSpec.describe CustomPrimaryKeyRecord, type: :model do
|
||||||
it { is_expected.to be_versioned }
|
it { is_expected.to be_versioned }
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require "rails_helper"
|
require "spec_helper"
|
||||||
|
|
||||||
RSpec.describe Document, type: :model do
|
RSpec.describe Document, type: :model do
|
||||||
describe "`have_a_version_with` matcher", versioning: true do
|
describe "`have_a_version_with` matcher", versioning: true do
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require "rails_helper"
|
require "spec_helper"
|
||||||
|
|
||||||
RSpec.describe Gadget, type: :model do
|
RSpec.describe Gadget, type: :model do
|
||||||
it { is_expected.to be_versioned }
|
it { is_expected.to be_versioned }
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require "rails_helper"
|
require "spec_helper"
|
||||||
|
|
||||||
RSpec.describe JoinedVersion, type: :model, versioning: true do
|
RSpec.describe JoinedVersion, type: :model, versioning: true do
|
||||||
let(:widget) { Widget.create!(name: FFaker::Name.name) }
|
let(:widget) { Widget.create!(name: FFaker::Name.name) }
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require "rails_helper"
|
require "spec_helper"
|
||||||
|
|
||||||
# The `json_versions` table tests postgres' `json` data type. So, that
|
# The `json_versions` table tests postgres' `json` data type. So, that
|
||||||
# table is only created when testing against postgres and ActiveRecord >= 4.
|
# table is only created when testing against postgres and ActiveRecord >= 4.
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require "rails_helper"
|
require "spec_helper"
|
||||||
|
|
||||||
module Kitchen
|
module Kitchen
|
||||||
RSpec.describe Banana, type: :model do
|
RSpec.describe Banana, type: :model do
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require "rails_helper"
|
require "spec_helper"
|
||||||
|
|
||||||
RSpec.describe NotOnUpdate, type: :model do
|
RSpec.describe NotOnUpdate, type: :model do
|
||||||
describe "#touch_with_version", versioning: true do
|
describe "#touch_with_version", versioning: true do
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require "rails_helper"
|
require "spec_helper"
|
||||||
|
|
||||||
RSpec.describe PostWithStatus, type: :model do
|
RSpec.describe PostWithStatus, type: :model do
|
||||||
with_versioning do
|
with_versioning do
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require "rails_helper"
|
require "spec_helper"
|
||||||
|
|
||||||
RSpec.describe Skipper, type: :model, versioning: true do
|
RSpec.describe Skipper, type: :model, versioning: true do
|
||||||
it { is_expected.to be_versioned }
|
it { is_expected.to be_versioned }
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require "rails_helper"
|
require "spec_helper"
|
||||||
|
|
||||||
RSpec.describe Thing, type: :model do
|
RSpec.describe Thing, type: :model do
|
||||||
it { is_expected.to be_versioned }
|
it { is_expected.to be_versioned }
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require "rails_helper"
|
require "spec_helper"
|
||||||
|
|
||||||
RSpec.describe Vehicle, type: :model do
|
RSpec.describe Vehicle, type: :model do
|
||||||
it { is_expected.not_to be_versioned }
|
it { is_expected.not_to be_versioned }
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require "rails_helper"
|
require "spec_helper"
|
||||||
|
|
||||||
module PaperTrail
|
module PaperTrail
|
||||||
::RSpec.describe Version, type: :model do
|
::RSpec.describe Version, type: :model do
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require "rails_helper"
|
require "spec_helper"
|
||||||
|
|
||||||
RSpec.describe Widget, type: :model do
|
RSpec.describe Widget, type: :model do
|
||||||
describe "`be_versioned` matcher" do
|
describe "`be_versioned` matcher" do
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require "rails_helper"
|
require "spec_helper"
|
||||||
|
|
||||||
RSpec.describe PaperTrail, type: :module, versioning: true do
|
RSpec.describe PaperTrail, type: :module, versioning: true do
|
||||||
describe "#config" do
|
describe "#config" do
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require "rails_helper"
|
require "spec_helper"
|
||||||
|
|
||||||
RSpec.describe PaperTrail::VersionConcern do
|
RSpec.describe PaperTrail::VersionConcern do
|
||||||
before(:all) { require "support/alt_db_init" }
|
before(:all) { require "support/alt_db_init" }
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require "rails_helper"
|
require "spec_helper"
|
||||||
|
|
||||||
RSpec.describe(::PaperTrail, versioning: true) do
|
RSpec.describe(::PaperTrail, versioning: true) do
|
||||||
CHAPTER_NAMES = [
|
CHAPTER_NAMES = [
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require "rails_helper"
|
require "spec_helper"
|
||||||
|
|
||||||
module PaperTrail
|
module PaperTrail
|
||||||
::RSpec.describe Cleaner, versioning: true do
|
::RSpec.describe Cleaner, versioning: true do
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require "rails_helper"
|
require "spec_helper"
|
||||||
|
|
||||||
module PaperTrail
|
module PaperTrail
|
||||||
::RSpec.describe Config do
|
::RSpec.describe Config do
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require "rails_helper"
|
require "spec_helper"
|
||||||
|
|
||||||
RSpec.describe(::PaperTrail, versioning: true) do
|
RSpec.describe(::PaperTrail, versioning: true) do
|
||||||
context "A record with defined 'only' and 'ignore' attributes" do
|
context "A record with defined 'only' and 'ignore' attributes" do
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require "rails_helper"
|
require "spec_helper"
|
||||||
require "support/custom_json_serializer"
|
require "support/custom_json_serializer"
|
||||||
|
|
||||||
RSpec.describe(PaperTrail, versioning: true) do
|
RSpec.describe(PaperTrail, versioning: true) do
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require "rails_helper"
|
require "spec_helper"
|
||||||
|
|
||||||
module CustomYamlSerializer
|
module CustomYamlSerializer
|
||||||
extend PaperTrail::Serializers::YAML
|
extend PaperTrail::Serializers::YAML
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require "rails_helper"
|
require "spec_helper"
|
||||||
|
|
||||||
module PaperTrail
|
module PaperTrail
|
||||||
module Serializers
|
module Serializers
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require "rails_helper"
|
require "spec_helper"
|
||||||
|
|
||||||
module PaperTrail
|
module PaperTrail
|
||||||
::RSpec.describe Cleaner, versioning: true do
|
::RSpec.describe Cleaner, versioning: true do
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require "rails_helper"
|
require "spec_helper"
|
||||||
|
|
||||||
module PaperTrail
|
module PaperTrail
|
||||||
::RSpec.describe(Version, versioning: true) do
|
::RSpec.describe(Version, versioning: true) do
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
require "rails_helper"
|
require "spec_helper"
|
||||||
|
|
||||||
RSpec.describe PaperTrail do
|
RSpec.describe PaperTrail do
|
||||||
describe ".gem_version" do
|
describe ".gem_version" do
|
||||||
|
|
|
@ -1,37 +0,0 @@
|
||||||
# This file is copied to spec/ when you run 'rails generate rspec:install'
|
|
||||||
ENV["RAILS_ENV"] ||= "test"
|
|
||||||
ENV["DB"] ||= "sqlite"
|
|
||||||
|
|
||||||
unless File.exist?(File.expand_path("../../test/dummy/config/database.yml", __FILE__))
|
|
||||||
warn "WARNING: No database.yml detected for the dummy app, please run `rake prepare` first"
|
|
||||||
end
|
|
||||||
|
|
||||||
require "spec_helper"
|
|
||||||
require File.expand_path("../../test/dummy/config/environment", __FILE__)
|
|
||||||
require "rspec/rails"
|
|
||||||
require "paper_trail/frameworks/rspec"
|
|
||||||
require "ffaker"
|
|
||||||
require "timecop"
|
|
||||||
|
|
||||||
# prevent Test::Unit's AutoRunner from executing during RSpec's rake task
|
|
||||||
Test::Unit.run = true if defined?(Test::Unit) && Test::Unit.respond_to?(:run=)
|
|
||||||
|
|
||||||
# Checks for pending migrations before tests are run.
|
|
||||||
# If you are not using ActiveRecord, you can remove this line.
|
|
||||||
ActiveRecord::Migration.check_pending! if ActiveRecord::Migration.respond_to?(:check_pending!)
|
|
||||||
|
|
||||||
require "database_cleaner"
|
|
||||||
DatabaseCleaner.strategy = :truncation
|
|
||||||
|
|
||||||
RSpec.configure do |config|
|
|
||||||
config.fixture_path = "#{::Rails.root}/spec/fixtures"
|
|
||||||
config.use_transactional_fixtures = active_record_gem_version >= ::Gem::Version.new("5")
|
|
||||||
|
|
||||||
# In rails < 5, some tests seem to require DatabaseCleaner-truncation.
|
|
||||||
# Truncation is about three times slower than transaction rollback, so it'll
|
|
||||||
# be nice when we can drop support for rails < 5.
|
|
||||||
if active_record_gem_version < ::Gem::Version.new("5")
|
|
||||||
config.before(:each) { DatabaseCleaner.start }
|
|
||||||
config.after(:each) { DatabaseCleaner.clean }
|
|
||||||
end
|
|
||||||
end
|
|
|
@ -1,4 +1,4 @@
|
||||||
require "rails_helper"
|
require "spec_helper"
|
||||||
|
|
||||||
RSpec.describe "Articles management", type: :request, order: :defined do
|
RSpec.describe "Articles management", type: :request, order: :defined do
|
||||||
let(:valid_params) { { article: { title: "Doh", content: FFaker::Lorem.sentence } } }
|
let(:valid_params) { { article: { title: "Doh", content: FFaker::Lorem.sentence } } }
|
||||||
|
|
|
@ -1,3 +1,11 @@
|
||||||
|
# This file is copied to spec/ when you run 'rails generate rspec:install'
|
||||||
|
ENV["RAILS_ENV"] ||= "test"
|
||||||
|
ENV["DB"] ||= "sqlite"
|
||||||
|
|
||||||
|
unless File.exist?(File.expand_path("../../test/dummy/config/database.yml", __FILE__))
|
||||||
|
warn "WARNING: No database.yml detected for the dummy app, please run `rake prepare` first"
|
||||||
|
end
|
||||||
|
|
||||||
require "pry"
|
require "pry"
|
||||||
|
|
||||||
RSpec.configure do |config|
|
RSpec.configure do |config|
|
||||||
|
@ -43,3 +51,32 @@ def params_wrapper(args)
|
||||||
args
|
args
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
require File.expand_path("../../test/dummy/config/environment", __FILE__)
|
||||||
|
require "rspec/rails"
|
||||||
|
require "paper_trail/frameworks/rspec"
|
||||||
|
require "ffaker"
|
||||||
|
require "timecop"
|
||||||
|
|
||||||
|
# prevent Test::Unit's AutoRunner from executing during RSpec's rake task
|
||||||
|
Test::Unit.run = true if defined?(Test::Unit) && Test::Unit.respond_to?(:run=)
|
||||||
|
|
||||||
|
# Checks for pending migrations before tests are run.
|
||||||
|
# If you are not using ActiveRecord, you can remove this line.
|
||||||
|
ActiveRecord::Migration.check_pending! if ActiveRecord::Migration.respond_to?(:check_pending!)
|
||||||
|
|
||||||
|
require "database_cleaner"
|
||||||
|
DatabaseCleaner.strategy = :truncation
|
||||||
|
|
||||||
|
RSpec.configure do |config|
|
||||||
|
config.fixture_path = "#{::Rails.root}/spec/fixtures"
|
||||||
|
config.use_transactional_fixtures = active_record_gem_version >= ::Gem::Version.new("5")
|
||||||
|
|
||||||
|
# In rails < 5, some tests seem to require DatabaseCleaner-truncation.
|
||||||
|
# Truncation is about three times slower than transaction rollback, so it'll
|
||||||
|
# be nice when we can drop support for rails < 5.
|
||||||
|
if active_record_gem_version < ::Gem::Version.new("5")
|
||||||
|
config.before(:each) { DatabaseCleaner.start }
|
||||||
|
config.after(:each) { DatabaseCleaner.clean }
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
Loading…
Reference in New Issue