sunspot_rails 2.2.7 → 2.2.8

data/spec/rails_app/app/controllers/application_controller.rb

@@ -0,0 +1,4 @@
+class ApplicationController < ActionController::Base
+  helper :all
+  protect_from_forgery
+end

data/spec/rails_app/app/controllers/posts_controller.rb

@@ -0,0 +1,16 @@
+class PostsController < ApplicationController
+  def create
+    PostWithAuto.create(permitted_params[:post])
+    head(:ok)
+  end
+
+  private
+
+  def permitted_params
+    if ::Rails::VERSION::MAJOR >= 4
+      params.permit! # ActionController::Parameters
+    else
+      params
+    end
+  end
+end

data/spec/rails_app/config.ru

@@ -0,0 +1,4 @@
+# This file is used by Rack-based servers to start the application.
+
+require ::File.expand_path('../config/environment',  __FILE__)
+run RailsApp::Application

data/spec/rails_app/config/application.rb

@@ -0,0 +1,14 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+Bundler.require(:default, Rails.env) if defined?(Bundler)
+
+module RailsApp
+  class Application < Rails::Application
+    config.encoding = 'utf-8'
+
+    # Configure sensitive parameters which will be filtered from the log file.
+    config.filter_parameters += [:password]
+  end
+end

data/spec/rails_app/config/boot.rb

@@ -0,0 +1,6 @@
+require 'rubygems'
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])

data/spec/rails_app/config/database.yml

@@ -0,0 +1,5 @@
+test:
+  adapter: sqlite3
+  database: ':memory:'
+  pool: 5
+  timeout: 5000

data/spec/rails_app/config/environment.rb

@@ -0,0 +1,5 @@
+# Load the rails application
+require File.expand_path('../application', __FILE__)
+
+# Initialize the rails application
+RailsApp::Application.initialize!

data/spec/rails_app/config/environments/test.rb

@@ -0,0 +1,38 @@
+RailsApp::Application.configure do
+  # Settings specified here will take precedence over those in config/application.rb
+
+  # The test environment is used exclusively to run your application's
+  # test suite.  You never need to work with it otherwise.  Remember that
+  # your test database is "scratch space" for the test suite and is wiped
+  # and recreated between test runs.  Don't rely on the data there!
+  config.cache_classes = true
+
+  # Eager load code on boot. This eager loads most of Rails and
+  # your application in memory, allowing both thread web servers
+  # and those relying on copy on write to perform better.
+  # Rake tasks automatically ignore this option for performance.
+  config.eager_load = true
+
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Raise exceptions instead of rendering exception templates
+  config.action_dispatch.show_exceptions = false
+
+  # Disable request forgery protection in test environment
+  config.action_controller.allow_forgery_protection    = false
+
+  # Tell Action Mailer not to deliver emails to the real world.
+  # The :test delivery method accumulates sent emails in the
+  # ActionMailer::Base.deliveries array.
+  config.action_mailer.delivery_method = :test
+
+  # Use SQL instead of Active Record's schema dumper when creating the test database.
+  # This is necessary if your schema can't be completely dumped by the schema dumper,
+  # like if you have constraints or database-specific column types
+  # config.active_record.schema_format = :sql
+
+  # Print deprecation notices to the stderr
+  config.active_support.deprecation = :stderr
+end

data/spec/rails_app/config/initializers/secret_token.rb

@@ -0,0 +1 @@
+Rails.application.config.secret_key_base = '_secret_key_base_'

data/spec/rails_app/config/initializers/session_store.rb

@@ -0,0 +1,3 @@
+# Be sure to restart your server when you modify this file.
+
+Rails.application.config.session_store :cookie_store, :key => '_rails_app_session'

data/spec/rails_app/db/schema.rb

@@ -0,0 +1,26 @@
+ActiveRecord::Schema.define(version: 0) do
+  create_table :posts, force: :cascade do |t|
+    t.string :title
+    t.string :type
+    t.integer :location_id
+    t.text :body
+    t.references :blog
+    t.timestamps null: true
+  end
+
+  create_table :locations, force: :cascade do |t|
+    t.float :lat
+    t.float :lng
+  end
+
+  create_table :blogs, force: :cascade do |t|
+    t.string :name
+    t.string :subdomain
+    t.timestamps null: true
+  end
+
+  create_table :writers, force: :cascade, primary_key: :writer_id do |t|
+    t.string :name
+    t.timestamps null: true
+  end
+end

data/spec/rake_task_spec.rb

@@ -12,27 +12,27 @@ describe 'sunspot namespace rake task' do
       run_rake_task("sunspot:reindex", '', '', true)
 
       # This model should not be used by any other test and therefore should only be loaded by this test
-      Sunspot.searchable.collect(&:name).should include('RakeTaskAutoLoadTestModel')
+      expect(Sunspot.searchable.collect(&:name)).to include('RakeTaskAutoLoadTestModel')
     end
 
     it "should accept a space delimited list of models to reindex" do
-      Post.should_receive(:solr_reindex)
-      Author.should_receive(:solr_reindex)
-      Blog.should_not_receive(:solr_reindex)
+      expect(Post).to receive(:solr_reindex)
+      expect(Author).to receive(:solr_reindex)
+      expect(Blog).not_to receive(:solr_reindex)
 
       run_rake_task("sunspot:reindex", '', "Post Author", true)
     end
 
     it "should accept a plus delimited list of models to reindex" do
-      Post.should_receive(:solr_reindex)
-      Author.should_receive(:solr_reindex)
-      Blog.should_not_receive(:solr_reindex)
+      expect(Post).to receive(:solr_reindex)
+      expect(Author).to receive(:solr_reindex)
+      expect(Blog).not_to receive(:solr_reindex)
 
       run_rake_task("sunspot:reindex", '', "Post+Author", true)
     end
 
     it "should raise exception when all tables of sunspot models are empty" do
-      STDOUT.should_receive(:puts).with("You have no data in the database. Reindexing does nothing here.")
+      expect(STDOUT).to receive(:puts).with("You have no data in the database. Reindexing does nothing here.")
       empty_tables
       run_rake_task("sunspot:reindex")
     end

data/spec/request_lifecycle_spec.rb

@@ -15,26 +15,22 @@ describe PostsController, :type => :controller do
     Sunspot::Rails.configuration = nil
   end
 
-  unless respond_to?(:describes)
-    controller_name :posts  # RSpec 1
-  end
-
   it 'should automatically commit after each action if specified' do
     @configuration.user_configuration = { 'auto_commit_after_request' => true }
-    Sunspot.should_receive(:commit_if_dirty)
-    post :create, :post => { :title => 'Test 1' }
+    expect(Sunspot).to receive(:commit_if_dirty)
+    post :create, :params => { :post => { :title => 'Test 1' } }
   end
   
   it 'should not commit, if configuration is set to false' do
     @configuration.user_configuration = { 'auto_commit_after_request' => false }
-    Sunspot.should_not_receive(:commit_if_dirty)
-    post :create, :post => { :title => 'Test 1' }
+    expect(Sunspot).not_to receive(:commit_if_dirty)
+    post :create, :params => { :post => { :title => 'Test 1' } }
   end
 
   it 'should commit if configuration is not specified' do
     @configuration.user_configuration = {}
-    Sunspot.should_receive(:commit_if_dirty)
-    post :create, :post => { :title => 'Test 1' }
+    expect(Sunspot).to receive(:commit_if_dirty)
+    post :create, :params => { :post => { :title => 'Test 1' } }
   end
   
   ### auto_commit_if_delete_dirty
@@ -42,20 +38,20 @@ describe PostsController, :type => :controller do
   it 'should automatically commit after each delete if specified' do
     @configuration.user_configuration = { 'auto_commit_after_request' => false,
                                           'auto_commit_after_delete_request' => true }
-    Sunspot.should_receive(:commit_if_delete_dirty)
-    post :create, :post => { :title => 'Test 1' }
+    expect(Sunspot).to receive(:commit_if_delete_dirty)
+    post :create, :params => { :post => { :title => 'Test 1' } }
   end
   
   it 'should not automatically commit on delete if configuration is set to false' do
     @configuration.user_configuration = { 'auto_commit_after_request' => false,
                                           'auto_commit_after_delete_request' => false }
-    Sunspot.should_not_receive(:commit_if_delete_dirty)
-    post :create, :post => { :title => 'Test 1' }
+    expect(Sunspot).not_to receive(:commit_if_delete_dirty)
+    post :create, :params => { :post => { :title => 'Test 1' } }
   end
 
   it 'should not automatically commit on delete if configuration is not specified' do
     @configuration.user_configuration = { 'auto_commit_after_request' => false }
-    Sunspot.should_not_receive(:commit_if_delete_dirty)
-    post :create, :post => { :title => 'Test 1' }
+    expect(Sunspot).not_to receive(:commit_if_delete_dirty)
+    post :create, :params => { :post => { :title => 'Test 1' } }
   end
 end

data/spec/schema.rb

@@ -1,27 +1,26 @@
-ActiveRecord::Schema.define(:version => 0) do
-  create_table :posts, :force => true do |t|
+ActiveRecord::Schema.define(version: 0) do
+  create_table :posts, force: true do |t|
     t.string :title
     t.string :type
     t.integer :location_id
     t.text :body
     t.references :blog
-    t.timestamps
+    t.timestamps null: true
   end
 
-  create_table :locations, :force => true do |t|
+  create_table :locations, force: true do |t|
     t.float :lat
     t.float :lng
   end
 
-  create_table :blogs, :force => true do |t|
+  create_table :blogs, force: true do |t|
     t.string :name
     t.string :subdomain
-    t.timestamps
+    t.timestamps null: true
   end
 
-  create_table :writers, :force => true, :primary_key => :writer_id do |t|
+  create_table :writers, force: true, primary_key: :writer_id do |t|
     t.string :name
-    t.timestamps
+    t.timestamps null: true
   end
-
 end

data/spec/searchable_spec.rb

@@ -6,10 +6,10 @@ describe Sunspot::Rails::Searchable do
     	# Rspec runs tests in random order, causing this test to fail on occasion unless we ensure the models have loaded.
     	Author; Blog; Post;
 
-      Sunspot.searchable.should_not be_empty
-      Sunspot.searchable.should include(Author)
-      Sunspot.searchable.should include(Blog)
-      Sunspot.searchable.should include(Post)
+      expect(Sunspot.searchable).not_to be_empty
+      expect(Sunspot.searchable).to include(Author)
+      expect(Sunspot.searchable).to include(Blog)
+      expect(Sunspot.searchable).to include(Post)
     end
   end
 end

data/spec/server_spec.rb

@@ -4,28 +4,28 @@ describe Sunspot::Rails::Server do
   before :each do
     @server = Sunspot::Rails::Server.new
     @config = Sunspot::Rails::Configuration.new
-    @server.stub(:configuration){ @config }
+    allow(@server).to receive(:configuration){ @config }
     @solr_home = File.join(@config.solr_home)
   end
 
   it "sets the correct Solr home" do
-    @server.solr_home.should == @solr_home
+    expect(@server.solr_home).to eq(@solr_home)
   end
 
   it "sets the correct Solr PID path" do
-    @server.pid_path.should == File.join(@server.pid_dir, 'sunspot-solr-test.pid')
+    expect(@server.pid_path).to eq(File.join(@server.pid_dir, 'sunspot-solr-test.pid'))
   end
 
   it "sets the correct port" do
-    @server.port.should == 8983
+    expect(@server.port).to eq(8983)
   end
 
   it "sets the log level using configuration" do
-    @config.stub(:log_level){ 'WARNING' }
-    @server.log_level.should == "WARNING"
+    allow(@config).to receive(:log_level){ 'WARNING' }
+    expect(@server.log_level).to eq("WARNING")
   end
 
   it "sets the correct log file" do
-    @server.log_file.should == File.join(Rails.root, 'log', 'sunspot-solr-test.log')
+    expect(@server.log_file).to eq(File.join(Rails.root, 'log', 'sunspot-solr-test.log'))
   end
 end

data/spec/session_spec.rb

@@ -19,7 +19,7 @@ describe 'Sunspot::Rails session' do
 
     # There should be no items in the queue with the same object_id
     object_ids = sessions.map(&:object_id)
-    object_ids.uniq.should == object_ids
+    expect(object_ids.uniq).to eq(object_ids)
   end
 
   it 'should create a separate master/slave session if configured' do
@@ -31,7 +31,7 @@ describe 'Sunspot::Rails session' do
   context 'disabled' do
     before do
       Sunspot::Rails.reset
-      ::Rails.stub(:env).and_return("config_disabled_test")
+      allow(::Rails).to receive(:env).and_return("config_disabled_test")
     end
 
     after do
@@ -39,7 +39,7 @@ describe 'Sunspot::Rails session' do
     end
 
     it 'sets the session proxy as a stub' do
-      Sunspot::Rails.build_session.should be_a_kind_of(Sunspot::Rails::StubSessionProxy)
+      expect(Sunspot::Rails.build_session).to be_a_kind_of(Sunspot::Rails::StubSessionProxy)
     end
   end
 

data/spec/shared_examples/indexed_after_save.rb

@@ -3,6 +3,6 @@ shared_examples_for 'indexed after save' do
     subject.save!
     Sunspot.commit
 
-    subject.class.search.results.should include(subject)
+    expect(subject.class.search.results).to include(subject)
   end
 end

data/spec/shared_examples/not_indexed_after_save.rb

@@ -3,6 +3,6 @@ shared_examples_for 'not indexed after save' do
     subject.save!
     Sunspot.commit
 
-    subject.class.search.results.should_not include(subject)
+    expect(subject.class.search.results).not_to include(subject)
   end
 end

data/spec/spec_helper.rb

@@ -1,75 +1,42 @@
-# This file is copied to spec/ when you run 'rails generate rspec:install'
 ENV["RAILS_ENV"] ||= 'test'
-if rsolr_version = ENV['RSOLR_GEM_VERSION']
-  STDERR.puts("Forcing RSolr version #{rsolr_version}")
-  gem "rsolr", rsolr_version
-end
-
-# Require the Database-specific gems
-ENV['DB'] ||= 'sqlite'
-Bundler.require(ENV['DB'])
 
-require File.expand_path('config/environment', ENV['RAILS_ROOT'])
+require File.expand_path('config/environment', File.expand_path('../rails_app', __FILE__))
+require File.expand_path('../../lib/sunspot_rails', __FILE__)
 require 'rspec/rails'
-require 'rspec/autorun'
-require File.join('sunspot', 'rails', 'solr_logging')
 
-# Requires supporting ruby files with custom matchers and macros, etc, in
-# spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
-# run as spec files by default. This means that files in spec/support that end
-# in _spec.rb will both be required and run as specs, causing the specs to be
-# run twice. It is recommended that you do not name files matching this glob to
-# end with _spec.rb. You can configure this pattern with with the --pattern
-# option on the command line or in ~/.rspec, .rspec or `.rspec-local`.
-Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
+if RSolr::VERSION >= '2'
+  require File.join('sunspot', 'rails', 'solr_logging')
+end
 
 # Load all shared examples
-Dir[File.expand_path("shared_examples/*.rb", File.dirname(__FILE__))].each {|f| require f}
+Dir[File.expand_path("shared_examples/*.rb", File.dirname(__FILE__))].each { |f| require f }
 
 # Load the schema
-load File.join(ENV['RAILS_ROOT'], 'db', 'schema.rb')
+load File.join(File.expand_path('../rails_app', __FILE__), 'db', 'schema.rb')
 
 RSpec.configure do |config|
-  # ## Mock Framework
-  #
-  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
-  #
-  # config.mock_with :mocha
-  # config.mock_with :flexmock
-  # config.mock_with :rr
-
-  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_path = "#{::Rails.root}/spec/fixtures"
-
-  # If you're not using ActiveRecord, or you'd prefer not to run each of your
-  # examples within a transaction, remove the following line or assign false
-  # instead of true.
   config.use_transactional_fixtures = true
-
-  # If true, the base class of anonymous controllers will be inferred
-  # automatically. This will be the default behavior in future versions of
-  # rspec-rails.
   config.infer_base_class_for_anonymous_controllers = false
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  # --seed 1234
-  config.order = "random"
+  config.order = 'random'
+  config.infer_spec_type_from_file_location!
 
   config.before(:each) do
     empty_tables
     Sunspot.remove_all!
-  end  
+  end
 end
 
 def empty_tables
-  ActiveRecord::Base.connection.tables.each do |table_name|
+  sources = if Rails::VERSION::MAJOR > 4
+              ActiveRecord::Base.connection.data_sources
+            else
+              ActiveRecord::Base.connection.tables
+            end
+  sources.each do |table_name|
     ActiveRecord::Base.connection.execute("DELETE FROM #{table_name}") unless table_name == 'schema_migrations'
   end
 end
 
-# COMPATIBILITY: Rails 4 has deprecated the 'scoped' method in favour of 'all'
 def relation(clazz)
-  ::Rails.version >= '4' ? clazz.all : clazz.scoped
-end
+  Rails::VERSION::MAJOR >= 4 ? clazz.all : clazz.scoped
+end