Skip to content

Commit

Permalink
Tests running & passing
Browse files Browse the repository at this point in the history
  • Loading branch information
iloveitaly committed Jan 9, 2013
1 parent e49f550 commit 69849e8
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 33 deletions.
4 changes: 1 addition & 3 deletions spec/spec.opts → .rspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
--colour
--format
progress
--loadby
mtime
--reverse
mtime
1 change: 0 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
source :rubygems

gemspec

2 changes: 1 addition & 1 deletion spec/controllers/email_sender_controller_spec.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require File.dirname(__FILE__) + '/../spec_helper'
require 'spec_helper'

describe Spree::EmailSenderController do

Expand Down
31 changes: 3 additions & 28 deletions spec/spec_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,37 +4,12 @@
require File.expand_path("../dummy/config/environment", __FILE__)
require 'rspec/rails'

#include spree's factories
require 'spree/core/testing_support/factories'

# include local factories
Dir["#{File.dirname(__FILE__)}/factories/**/*.rb"].each do |f|
fp = File.expand_path(f)
require fp
end
require 'spree/core/url_helpers'

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

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, comment the following line or assign false
# instead of true.
config.use_transactional_fixtures = true
config.use_transactional_fixtures = false
config.include Spree::Core::UrlHelpers
end

Spree::Zone.class_eval do
def self.global
find_by_name("GlobalZone") || Factory(:global_zone)
end
end

@configuration ||= Spree::AppConfiguration.find_or_create_by_name("Default configuration")
3 changes: 3 additions & 0 deletions spree_email_to_friend.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,8 @@ Gem::Specification.new do |s|

s.add_dependency 'spree_core', '~> 1.3.0'
s.add_dependency 'recaptcha', '>= 0.3.1'

s.add_development_dependency 'rspec-rails'
s.add_development_dependency 'sqlite3'
s.add_development_dependency 'factory_girl', '~> 2.6'
end

0 comments on commit 69849e8

Please sign in to comment.