Skip to content

Commit

Permalink
Making spec/feature paths a bit more explicit, so they're 1.9.2 frien…
Browse files Browse the repository at this point in the history
…dly.
  • Loading branch information
pat committed Jun 29, 2010
1 parent 2ca3695 commit 294bc74
Show file tree
Hide file tree
Showing 28 changed files with 38 additions and 36 deletions.
5 changes: 3 additions & 2 deletions Rakefile
@@ -1,3 +1,4 @@
require 'rubygems'
require 'tasks/distribution'
require 'tasks/testing'

require "#{File.dirname(__FILE__)}/tasks/distribution"
require "#{File.dirname(__FILE__)}/tasks/testing"
4 changes: 2 additions & 2 deletions features/thinking_sphinx/models/developer.rb
@@ -1,5 +1,5 @@
require 'features/thinking_sphinx/models/tag'
require 'features/thinking_sphinx/models/tagging'
require "#{File.dirname(__FILE__)}/tag"
require "#{File.dirname(__FILE__)}/tagging"

class Developer < ActiveRecord::Base
has_many :taggings, :as => :taggable
Expand Down
2 changes: 1 addition & 1 deletion features/thinking_sphinx/models/extensible_beta.rb
@@ -1,4 +1,4 @@
require 'features/support/lib/generic_delta_handler'
require "#{Dir.pwd}/features/support/lib/generic_delta_handler"

class ExtensibleBeta < ActiveRecord::Base
define_index do
Expand Down
11 changes: 6 additions & 5 deletions lib/cucumber/thinking_sphinx/internal_world.rb
Expand Up @@ -9,11 +9,12 @@ class InternalWorld
:password, :host

def initialize
@temporary_directory = "#{Dir.pwd}/tmp"
@migrations_directory = "features/thinking_sphinx/db/migrations"
@models_directory = "features/thinking_sphinx/models"
@fixtures_directory = "features/thinking_sphinx/db/fixtures"
@database_file = "features/thinking_sphinx/database.yml"
pwd = Dir.pwd
@temporary_directory = "#{pwd}/tmp"
@migrations_directory = "#{pwd}/features/thinking_sphinx/db/migrations"
@models_directory = "#{pwd}/features/thinking_sphinx/models"
@fixtures_directory = "#{pwd}/features/thinking_sphinx/db/fixtures"
@database_file = "#{pwd}/features/thinking_sphinx/database.yml"

@adapter = ENV['DATABASE'] || 'mysql'
@database = 'thinking_sphinx'
Expand Down
6 changes: 3 additions & 3 deletions spec/spec_helper.rb
Expand Up @@ -8,11 +8,11 @@
require 'ginger'
require 'jeweler'

require "lib/thinking_sphinx"
require "#{File.dirname(__FILE__)}/../lib/thinking_sphinx"

require 'will_paginate'

require 'spec/sphinx_helper'
require "#{File.dirname(__FILE__)}/sphinx_helper"

ActiveRecord::Base.logger = Logger.new(StringIO.new)

Expand All @@ -26,7 +26,7 @@
sphinx = SphinxHelper.new
sphinx.setup_mysql

require 'spec/fixtures/models'
require "#{File.dirname(__FILE__)}/fixtures/models"
ThinkingSphinx.context.define_indexes

config.before :all do
Expand Down
2 changes: 1 addition & 1 deletion spec/thinking_sphinx/active_record/delta_spec.rb
@@ -1,4 +1,4 @@
require 'spec/spec_helper'
require 'spec_helper'

describe "ThinkingSphinx::ActiveRecord::Delta" do
it "should call the toggle_delta method after a save" do
Expand Down
@@ -1,4 +1,4 @@
require 'spec/spec_helper'
require 'spec_helper'

describe 'ThinkingSphinx::ActiveRecord::HasManyAssociation' do
describe "search method" do
Expand Down
2 changes: 1 addition & 1 deletion spec/thinking_sphinx/active_record/scopes_spec.rb
@@ -1,4 +1,4 @@
require 'spec/spec_helper'
require 'spec_helper'

describe ThinkingSphinx::ActiveRecord::Scopes do
after :each do
Expand Down
2 changes: 1 addition & 1 deletion spec/thinking_sphinx/active_record_spec.rb
@@ -1,4 +1,4 @@
require 'spec/spec_helper'
require 'spec_helper'

describe ThinkingSphinx::ActiveRecord do
before :each do
Expand Down
2 changes: 1 addition & 1 deletion spec/thinking_sphinx/association_spec.rb
@@ -1,4 +1,4 @@
require 'spec/spec_helper'
require 'spec_helper'

describe ThinkingSphinx::Association do
describe '.children' do
Expand Down
2 changes: 1 addition & 1 deletion spec/thinking_sphinx/attribute_spec.rb
@@ -1,4 +1,4 @@
require 'spec/spec_helper'
require 'spec_helper'

describe ThinkingSphinx::Attribute do
before :each do
Expand Down
2 changes: 1 addition & 1 deletion spec/thinking_sphinx/auto_version_spec.rb
@@ -1,4 +1,4 @@
require 'spec/spec_helper'
require 'spec_helper'

describe ThinkingSphinx::AutoVersion do
describe '.detect' do
Expand Down
2 changes: 1 addition & 1 deletion spec/thinking_sphinx/configuration_spec.rb
@@ -1,4 +1,4 @@
require 'spec/spec_helper'
require 'spec_helper'

describe ThinkingSphinx::Configuration do
describe "environment class method" do
Expand Down
2 changes: 1 addition & 1 deletion spec/thinking_sphinx/context_spec.rb
@@ -1,4 +1,4 @@
require 'spec/spec_helper'
require 'spec_helper'

describe ThinkingSphinx::Context do
before :each do
Expand Down
2 changes: 1 addition & 1 deletion spec/thinking_sphinx/core/array_spec.rb
@@ -1,4 +1,4 @@
require 'spec/spec_helper'
require 'spec_helper'

describe Array do
describe '.===' do
Expand Down
2 changes: 1 addition & 1 deletion spec/thinking_sphinx/core/string_spec.rb
@@ -1,4 +1,4 @@
require 'spec/spec_helper'
require 'spec_helper'

describe String do
describe "to_crc32 instance method" do
Expand Down
2 changes: 1 addition & 1 deletion spec/thinking_sphinx/excerpter_spec.rb
@@ -1,4 +1,4 @@
require 'spec/spec_helper'
require 'spec_helper'

describe ThinkingSphinx::Excerpter do
before :each do
Expand Down
2 changes: 1 addition & 1 deletion spec/thinking_sphinx/facet_search_spec.rb
@@ -1,4 +1,4 @@
require 'spec/spec_helper'
require 'spec_helper'

describe ThinkingSphinx::FacetSearch do
describe 'populate' do
Expand Down
2 changes: 1 addition & 1 deletion spec/thinking_sphinx/facet_spec.rb
@@ -1,4 +1,4 @@
require 'spec/spec_helper'
require 'spec_helper'

describe ThinkingSphinx::Facet do
describe ".name_for" do
Expand Down
2 changes: 1 addition & 1 deletion spec/thinking_sphinx/field_spec.rb
@@ -1,4 +1,4 @@
require 'spec/spec_helper'
require 'spec_helper'

describe ThinkingSphinx::Field do
before :each do
Expand Down
2 changes: 1 addition & 1 deletion spec/thinking_sphinx/index/builder_spec.rb
@@ -1,4 +1,4 @@
require 'spec/spec_helper'
require 'spec_helper'

describe ThinkingSphinx::Index::Builder do
describe ".generate without source scope" do
Expand Down
2 changes: 1 addition & 1 deletion spec/thinking_sphinx/index/faux_column_spec.rb
@@ -1,4 +1,4 @@
require 'spec/spec_helper'
require 'spec_helper'

describe ThinkingSphinx::Index::FauxColumn do
describe "coerce class method" do
Expand Down
2 changes: 1 addition & 1 deletion spec/thinking_sphinx/index_spec.rb
@@ -1,4 +1,4 @@
require 'spec/spec_helper'
require 'spec_helper'

describe ThinkingSphinx::Index do
describe "prefix_fields method" do
Expand Down
2 changes: 1 addition & 1 deletion spec/thinking_sphinx/rails_additions_spec.rb
@@ -1,4 +1,4 @@
require 'spec/spec_helper'
require 'spec_helper'

describe ThinkingSphinx::HashExcept do
before(:each) do
Expand Down
2 changes: 1 addition & 1 deletion spec/thinking_sphinx/search_methods_spec.rb
@@ -1,4 +1,4 @@
require 'spec/spec_helper'
require 'spec_helper'

describe ThinkingSphinx::SearchMethods do
it "should be included into models with indexes" do
Expand Down
2 changes: 1 addition & 1 deletion spec/thinking_sphinx/search_spec.rb
@@ -1,4 +1,4 @@
require 'spec/spec_helper'
require 'spec_helper'
require 'will_paginate/collection'

describe ThinkingSphinx::Search do
Expand Down
2 changes: 1 addition & 1 deletion spec/thinking_sphinx/source_spec.rb
@@ -1,4 +1,4 @@
require 'spec/spec_helper'
require 'spec_helper'

describe ThinkingSphinx::Source do
before :each do
Expand Down
2 changes: 1 addition & 1 deletion spec/thinking_sphinx_spec.rb
@@ -1,4 +1,4 @@
require 'spec/spec_helper'
require 'spec_helper'

describe ThinkingSphinx do
describe '.context' do
Expand Down

0 comments on commit 294bc74

Please sign in to comment.