Test cleanup

Author: wollistik

spec/acts_as_recursive_tree/builders/ancestors_spec.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe ActsAsRecursiveTree::Builders::Ancestors do
+  context 'basic' do
+    it_behaves_like 'build recursive query'
+    it_behaves_like 'ancestor query'
+    include_context 'context with ordering'
+  end
+
+  context 'with options' do
+    include_context 'setup with enforced ordering' do
+      it_behaves_like 'with ordering'
+    end
+  end
+end

spec/acts_as_recursive_tree/builders/descendants_spec.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe ActsAsRecursiveTree::Builders::Descendants do
+  context 'basic' do
+    it_behaves_like 'build recursive query'
+    it_behaves_like 'descendant query'
+    include_context 'context without ordering'
+  end
+
+  context 'with options' do
+    include_context 'setup with enforced ordering' do
+      let(:ordering) { true }
+      it_behaves_like 'with ordering'
+    end
+  end
+end

spec/acts_as_recursive_tree/builders/leaves_spec.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe ActsAsRecursiveTree::Builders::Leaves do
+  context 'basic' do
+    it_behaves_like 'build recursive query'
+    it_behaves_like 'descendant query'
+    include_context 'context without ordering'
+  end
+
+  context 'with options' do
+    include_context 'setup with enforced ordering' do
+      let(:ordering) { true }
+      it_behaves_like 'without ordering'
+    end
+  end
+end

spec/values_spec.rb …as_recursive_tree/options/values_spec.rbspec/values_spec.rb renamed to spec/acts_as_recursive_tree/options/values_spec.rb spec/values_spec.rb renamed to spec/acts_as_recursive_tree/options/values_spec.rb

@@ -2,21 +2,21 @@
 
 require 'spec_helper'
 
-shared_examples 'single values' do
-  subject(:value) { described_class.create(single_value) }
+RSpec.describe ActsAsRecursiveTree::Options::Values do
+  shared_examples 'single values' do
+    subject(:value) { described_class.create(single_value) }
 
-  it { is_expected.to be_a ActsAsRecursiveTree::Options::Values::SingleValue }
+    it { is_expected.to be_a described_class::SingleValue }
 
-  it 'apply_toes' do
-    expect(value.apply_to(attribute).to_sql).to end_with " = #{single_value}"
-  end
+    it 'apply_toes' do
+      expect(value.apply_to(attribute).to_sql).to end_with " = #{single_value}"
+    end
 
-  it 'apply_negated_toes' do
-    expect(value.apply_negated_to(attribute).to_sql).to end_with " != #{single_value}"
+    it 'apply_negated_toes' do
+      expect(value.apply_negated_to(attribute).to_sql).to end_with " != #{single_value}"
+    end
   end
-end
 
-describe ActsAsRecursiveTree::Options::Values do
   let(:table) { Arel::Table.new('test_table') }
   let(:attribute) { table['test_attr'] }
 
@@ -44,7 +44,7 @@
 
       let(:array) { [1, 2, 3] }
 
-      it { is_expected.to be_a ActsAsRecursiveTree::Options::Values::MultiValue }
+      it { is_expected.to be_a described_class::MultiValue }
 
       it 'apply_toes' do
         expect(value.apply_to(attribute).to_sql).to end_with " IN (#{array.join(', ')})"
@@ -60,7 +60,7 @@
 
       let(:range) { 1..3 }
 
-      it { is_expected.to be_a ActsAsRecursiveTree::Options::Values::RangeValue }
+      it { is_expected.to be_a described_class::RangeValue }
 
       it 'apply_toes' do
         expect(value.apply_to(attribute).to_sql).to end_with "BETWEEN #{range.begin} AND #{range.end}"
@@ -83,7 +83,7 @@ def self.primary_key
         end
       end
 
-      it { is_expected.to be_a ActsAsRecursiveTree::Options::Values::Relation }
+      it { is_expected.to be_a described_class::Relation }
 
       it 'apply_toes' do
         expect(value.apply_to(attribute).to_sql).to match(/IN \(SELECT.*\)/)

spec/model/location_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Location do
+RSpec.describe Location do
   before do
     @building = Building.create!(name: 'big house')
 

spec/model/node_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe Node do
+RSpec.describe Node do
   include TreeMethods
 
   before do

spec/model/relation_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-describe 'Relation' do
+RSpec.describe 'Relation' do
   def create_tree(max_level, current_level: 0, node: nil, stop_at: nil)
     node = Node.create!(name: 'root') if node.nil?
 

spec/spec_helper.rb

@@ -76,7 +76,7 @@
   #   #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
   #   #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
   #   #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
-  #   config.disable_monkey_patching!
+    config.disable_monkey_patching!
   #
   #   # This setting enables warnings. It's recommended, but in some cases may
   #   # be too noisy due to issues in dependencies.

spec/builders_spec.rb spec/support/shared_examples/builders.rbspec/builders_spec.rb renamed to spec/support/shared_examples/builders.rb

@@ -1,15 +1,12 @@
-# frozen_string_literal: true
 
-require 'spec_helper'
-
-shared_context 'setup with enforced ordering' do
+RSpec.shared_context 'setup with enforced ordering' do
   let(:ordering) { false }
   include_context 'base_setup' do
     let(:proc) { ->(config) { config.ensure_ordering! } }
   end
 end
 
-shared_context 'base_setup' do
+RSpec.shared_context 'base_setup' do
   subject(:query) { builder.build.to_sql }
 
   let(:model_id) { 1 }
@@ -21,7 +18,7 @@
   end
 end
 
-shared_examples 'basic recursive examples' do
+RSpec.shared_examples 'basic recursive examples' do
   it { is_expected.to start_with "SELECT \"#{model_class.table_name}\".* FROM \"#{model_class.table_name}\"" }
 
   it { is_expected.to match(/WHERE "#{model_class.table_name}"."#{model_class.primary_key}" = #{model_id}/) }
@@ -35,7 +32,7 @@
   }
 end
 
-shared_examples 'build recursive query' do
+RSpec.shared_examples 'build recursive query' do
   context 'simple id' do
     context 'with simple class' do
       include_context 'base_setup' do
@@ -67,79 +64,35 @@
   end
 end
 
-shared_examples 'ancestor query' do
+RSpec.shared_examples 'ancestor query' do
   include_context 'base_setup'
 
   it { is_expected.to match(/"#{builder.travers_loc_table.name}"."#{model_class._recursive_tree_config.parent_key}" = "#{model_class.table_name}"."#{model_class.primary_key}"/) }
 end
 
-shared_examples 'descendant query' do
+RSpec.shared_examples 'descendant query' do
   include_context 'base_setup'
 
   it { is_expected.to match(/"#{model_class.table_name}"."#{model_class._recursive_tree_config.parent_key}" = "#{builder.travers_loc_table.name}"."#{model_class.primary_key}"/) }
   it { is_expected.to match(/#{Regexp.escape(builder.travers_loc_table.project(builder.travers_loc_table[model_class.primary_key]).to_sql)}/) }
 end
 
-shared_context 'context with ordering' do
+RSpec.shared_context 'context with ordering' do
   include_context 'base_setup' do
     it_behaves_like 'with ordering'
   end
 end
 
-shared_context 'context without ordering' do
+RSpec.shared_context 'context without ordering' do
   include_context 'base_setup' do
     it_behaves_like 'without ordering'
   end
 end
 
-shared_examples 'with ordering' do
+RSpec.shared_examples 'with ordering' do
   it { is_expected.to match(/ORDER BY #{Regexp.escape(builder.recursive_temp_table[model_class._recursive_tree_config.depth_column].asc.to_sql)}/) }
 end
 
-shared_examples 'without ordering' do
+RSpec.shared_examples 'without ordering' do
   it { is_expected.not_to match(/ORDER BY/) }
 end
-
-describe ActsAsRecursiveTree::Builders::Descendants do
-  context 'basic' do
-    it_behaves_like 'build recursive query'
-    it_behaves_like 'descendant query'
-    include_context 'context without ordering'
-  end
-
-  context 'with options' do
-    include_context 'setup with enforced ordering' do
-      let(:ordering) { true }
-      it_behaves_like 'with ordering'
-    end
-  end
-end
-
-describe ActsAsRecursiveTree::Builders::Ancestors do
-  context 'basic' do
-    it_behaves_like 'build recursive query'
-    it_behaves_like 'ancestor query'
-    include_context 'context with ordering'
-  end
-
-  context 'with options' do
-    include_context 'setup with enforced ordering' do
-      it_behaves_like 'with ordering'
-    end
-  end
-end
-
-describe ActsAsRecursiveTree::Builders::Leaves do
-  context 'basic' do
-    it_behaves_like 'build recursive query'
-    it_behaves_like 'descendant query'
-    include_context 'context without ordering'
-  end
-
-  context 'with options' do
-    include_context 'setup with enforced ordering' do
-      let(:ordering) { true }
-      it_behaves_like 'without ordering'
-    end
-  end
-end