Browse files

Remove Rubinius binary generated into script/rails and install RSpec.

  • Loading branch information...
1 parent 76e8b4e commit 3d2e69c8906063b9874496e3f881a93a210f3e69 @nz nz committed Jun 3, 2011
Showing with 49 additions and 1 deletion.
  1. +1 −0 .rspec
  2. +1 −0 .rvmrc
  3. +4 −0 Gemfile
  4. +15 −0 Gemfile.lock
  5. +1 −1 script/rails
  6. +27 −0 spec/spec_helper.rb
View
1 .rspec
@@ -0,0 +1 @@
+--colour
View
1 .rvmrc
@@ -0,0 +1 @@
+rvm use 1.9.2
View
4 Gemfile
@@ -13,3 +13,7 @@ gem 'pjax-rails'
# Everything else
gem 'rsolr'
+
+group :development, :test do
+ gem 'rspec-rails'
+end
View
15 Gemfile.lock
@@ -38,6 +38,7 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.1.1)
+ diff-lcs (1.1.2)
erubis (2.7.0)
execjs (1.1.0)
multi_json (~> 1.0)
@@ -82,6 +83,19 @@ GEM
rake (0.9.1)
rsolr (0.12.1)
builder (>= 2.1.2)
+ rspec (2.5.0)
+ rspec-core (~> 2.5.0)
+ rspec-expectations (~> 2.5.0)
+ rspec-mocks (~> 2.5.0)
+ rspec-core (2.5.1)
+ rspec-expectations (2.5.0)
+ diff-lcs (~> 1.1.2)
+ rspec-mocks (2.5.0)
+ rspec-rails (2.5.0)
+ actionpack (~> 3.0)
+ activesupport (~> 3.0)
+ railties (~> 3.0)
+ rspec (~> 2.5.0)
sass (3.1.2)
sprockets (2.0.0.beta.9)
hike (~> 1.0)
@@ -106,5 +120,6 @@ DEPENDENCIES
pjax-rails
rails (= 3.1.0.rc1)
rsolr
+ rspec-rails
sass
uglifier
View
2 script/rails
@@ -1,4 +1,4 @@
-#!/usr/bin/env rbx
+#!/usr/bin/env ruby
# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
APP_PATH = File.expand_path('../../config/application', __FILE__)
View
27 spec/spec_helper.rb
@@ -0,0 +1,27 @@
+# This file is copied to spec/ when you run 'rails generate rspec:install'
+ENV["RAILS_ENV"] ||= 'test'
+require File.expand_path("../../config/environment", __FILE__)
+require 'rspec/rails'
+
+# Requires supporting ruby files with custom matchers and macros, etc,
+# in spec/support/ and its subdirectories.
+Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require f}
+
+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
+ config.mock_with :rspec
+
+ # 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
+end

0 comments on commit 3d2e69c

Please sign in to comment.