Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .rspec
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
--colour
--backtrace
2 changes: 1 addition & 1 deletion spec/acts_as_taggable_on/acts_as_taggable_on_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'spec_helper'

describe 'Acts As Taggable On' do
RSpec.describe 'Acts As Taggable On' do

it "should provide a class method 'taggable?' that is false for untaggable models" do
expect(UntaggableModel).to_not be_taggable
Expand Down
2 changes: 1 addition & 1 deletion spec/acts_as_taggable_on/acts_as_tagger_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'spec_helper'

describe 'acts_as_tagger' do
RSpec.describe 'acts_as_tagger' do

describe 'Tagger Method Generation' do
before(:each) do
Expand Down
2 changes: 1 addition & 1 deletion spec/acts_as_taggable_on/caching_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'spec_helper'

describe 'Acts As Taggable On' do
RSpec.describe 'Acts As Taggable On' do

describe 'Caching' do
before(:each) do
Expand Down
2 changes: 1 addition & 1 deletion spec/acts_as_taggable_on/default_parser_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'spec_helper'

describe ActsAsTaggableOn::DefaultParser do
RSpec.describe ActsAsTaggableOn::DefaultParser do
it '#parse should return empty array if empty array is passed' do
parser = ActsAsTaggableOn::DefaultParser.new([])
expect(parser.parse).to be_empty
Expand Down
2 changes: 1 addition & 1 deletion spec/acts_as_taggable_on/dirty_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'spec_helper'

describe 'Dirty behavior of taggable objects' do
RSpec.describe 'Dirty behavior of taggable objects' do
context 'with un-contexted tags' do
before(:each) do
@taggable = TaggableModel.create(tag_list: 'awesome, epic')
Expand Down
2 changes: 1 addition & 1 deletion spec/acts_as_taggable_on/generic_parser_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'spec_helper'

describe ActsAsTaggableOn::GenericParser do
RSpec.describe ActsAsTaggableOn::GenericParser do
it '#parse should return empty array if empty tag string is passed' do
tag_list = ActsAsTaggableOn::GenericParser.new('')
expect(tag_list.parse).to be_empty
Expand Down
2 changes: 1 addition & 1 deletion spec/acts_as_taggable_on/related_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'spec_helper'

describe 'Acts As Taggable On' do
RSpec.describe 'Acts As Taggable On' do

describe 'Related Objects' do

Expand Down
2 changes: 1 addition & 1 deletion spec/acts_as_taggable_on/single_table_inheritance_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'spec_helper'

describe 'Single Table Inheritance' do
RSpec.describe 'Single Table Inheritance' do
let(:taggable) { TaggableModel.new(name: 'taggable model') }

let(:inheriting_model) { InheritingTaggableModel.new(name: 'Inheriting Taggable Model') }
Expand Down
2 changes: 1 addition & 1 deletion spec/acts_as_taggable_on/tag_list_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'spec_helper'

describe ActsAsTaggableOn::TagList do
RSpec.describe ActsAsTaggableOn::TagList do
let(:tag_list) { ActsAsTaggableOn::TagList.new('awesome', 'radical') }
let(:another_tag_list) { ActsAsTaggableOn::TagList.new('awesome','crazy', 'alien') }

Expand Down
5 changes: 2 additions & 3 deletions spec/acts_as_taggable_on/tag_spec.rb
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
require 'spec_helper'
require 'db/migrate/2_add_missing_unique_indices.rb'


shared_examples_for 'without unique index' do
RSpec.shared_examples_for 'without unique index' do
prepend_before(:all) { AddMissingUniqueIndices.down }
append_after(:all) do
ActsAsTaggableOn::Tag.delete_all
AddMissingUniqueIndices.up
end
end

describe ActsAsTaggableOn::Tag do
RSpec.describe ActsAsTaggableOn::Tag do
before(:each) do
@tag = ActsAsTaggableOn::Tag.new
@user = TaggableModel.create(name: 'Pablo', tenant_id: 100)
Expand Down
6 changes: 3 additions & 3 deletions spec/acts_as_taggable_on/taggable_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'spec_helper'

describe 'Taggable To Preserve Order' do
RSpec.describe 'Taggable To Preserve Order' do
before(:each) do
@taggable = OrderedTaggableModel.new(name: 'Bob Jones')
end
Expand Down Expand Up @@ -94,7 +94,7 @@
end
end

describe 'Taggable' do
RSpec.describe 'Taggable' do
before(:each) do
@taggable = TaggableModel.new(name: 'Bob Jones')
@taggables = [@taggable, TaggableModel.new(name: 'John Doe')]
Expand Down Expand Up @@ -798,7 +798,7 @@
end
end

describe 'Taggable model with json columns', if: postgresql_support_json? do
RSpec.describe 'Taggable model with json columns', if: postgresql_support_json? do
before(:each) do
@taggable = TaggableModelWithJson.new(:name => 'Bob Jones')
@taggables = [@taggable, TaggableModelWithJson.new(:name => 'John Doe')]
Expand Down
4 changes: 1 addition & 3 deletions spec/acts_as_taggable_on/tagger_spec.rb
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
require 'spec_helper'

describe 'Tagger' do
RSpec.describe 'Tagger' do
before(:each) do
@user = User.create
@taggable = TaggableModel.create(name: 'Bob Jones')
end



it 'should have taggings' do
@user.tag(@taggable, with: 'ruby,scheme', on: :tags)
expect(@user.owned_taggings.size).to eq(2)
Expand Down
2 changes: 1 addition & 1 deletion spec/acts_as_taggable_on/tagging_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'spec_helper'

describe ActsAsTaggableOn::Tagging do
RSpec.describe ActsAsTaggableOn::Tagging do
before(:each) do
@tagging = ActsAsTaggableOn::Tagging.new
end
Expand Down
3 changes: 1 addition & 2 deletions spec/acts_as_taggable_on/tags_helper_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'spec_helper'

describe ActsAsTaggableOn::TagsHelper do
RSpec.describe ActsAsTaggableOn::TagsHelper do
before(:each) do
@bob = TaggableModel.create(name: 'Bob Jones', language_list: 'ruby, php')
@tom = TaggableModel.create(name: 'Tom Marley', language_list: 'ruby, java')
Expand All @@ -12,7 +12,6 @@ class Helper
end.new
end


it 'should yield the proper css classes' do
tags = {}

Expand Down
2 changes: 1 addition & 1 deletion spec/acts_as_taggable_on/utils_spec.rb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
require 'spec_helper'

describe ActsAsTaggableOn::Utils do
RSpec.describe ActsAsTaggableOn::Utils do
describe '#like_operator' do
it 'should return \'ILIKE\' when the adapter is PostgreSQL' do
allow(ActsAsTaggableOn::Utils.connection).to receive(:adapter_name) { 'PostgreSQL' }
Expand Down
28 changes: 28 additions & 0 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,32 @@

RSpec.configure do |config|
config.raise_errors_for_deprecations!

config.color = true

# disable monkey patching
# see: https://rspec.info/features/3-13/rspec-core/configuration/zero-monkey-patching-mode/
config.disable_monkey_patching!

config.before(:suite) do
DatabaseCleaner.clean_with(:truncation)
DatabaseCleaner.strategy = :transaction
DatabaseCleaner.clean
end

config.before(:each, :database_cleaner_delete) do
DatabaseCleaner.strategy = :truncation
end

config.after(:suite) do
DatabaseCleaner.clean
end

config.before(:each) do
DatabaseCleaner.start
end

config.after(:each) do
DatabaseCleaner.clean
end
end
25 changes: 0 additions & 25 deletions spec/support/database_cleaner.rb

This file was deleted.