diff --git a/rails/map-mash/Gemfile b/rails/map-mash/Gemfile index 869f668..e0317da 100644 --- a/rails/map-mash/Gemfile +++ b/rails/map-mash/Gemfile @@ -33,6 +33,7 @@ group :development, :test, :cucumber do gem 'database_cleaner', '0.6.7' gem 'email_spec', '0.6.2' gem 'fake_ftp', '0.0.9' + gem 'faker' gem 'fakeredis', '0.2.2' gem 'fakeweb', '1.3.0' gem 'foreman' diff --git a/rails/map-mash/Gemfile.lock b/rails/map-mash/Gemfile.lock index 6a62041..497625e 100644 --- a/rails/map-mash/Gemfile.lock +++ b/rails/map-mash/Gemfile.lock @@ -28,6 +28,7 @@ GEM email_spec (0.6.2) eventmachine (0.12.10) fake_ftp (0.0.9) + faker (0.3.1) fakeredis (0.2.2) redis (~> 2.2.0) fakeweb (1.3.0) @@ -167,6 +168,7 @@ DEPENDENCIES database_cleaner (= 0.6.7) email_spec (= 0.6.2) fake_ftp (= 0.0.9) + faker fakeredis (= 0.2.2) fakeweb (= 1.3.0) fastercsv diff --git a/rails/map-mash/app/models/mash_tournament.rb b/rails/map-mash/app/models/mash_tournament.rb index 661267c..2d2e729 100644 --- a/rails/map-mash/app/models/mash_tournament.rb +++ b/rails/map-mash/app/models/mash_tournament.rb @@ -2,8 +2,8 @@ class MashTournament < ActiveRecord::Base belongs_to :requester has_many :mashes has_many :rounds, :class_name => 'MashTournamentRound' - after_create :create_rounds - after_save :maybe_fill_in_next_round + #after_create :create_rounds + #after_save :maybe_fill_in_next_round def next_unplayed_mash self.mashes.unplayed.first diff --git a/rails/map-mash/spec/blueprints.rb b/rails/map-mash/spec/blueprints.rb new file mode 100644 index 0000000..8d69f0d --- /dev/null +++ b/rails/map-mash/spec/blueprints.rb @@ -0,0 +1,29 @@ +require 'machinist/active_record' +require 'sham' +require 'faker' + + + +Map.blueprint do + +end + + +Mash.blueprint do + +end + + +MashTournament.blueprint do + +end + + +MashTournamentRound.blueprint do + +end + + +Requester.blueprint do + +end diff --git a/rails/map-mash/spec/spec_helper.rb b/rails/map-mash/spec/spec_helper.rb index 1f72de0..9a87f5d 100644 --- a/rails/map-mash/spec/spec_helper.rb +++ b/rails/map-mash/spec/spec_helper.rb @@ -1,54 +1,18 @@ -# This file is copied to ~/spec when you run 'ruby script/generate rspec' -# from the project root directory. ENV["RAILS_ENV"] ||= 'test' require File.expand_path(File.join(File.dirname(__FILE__),'..','config','environment')) require 'spec/autorun' require 'spec/rails' -# Uncomment the next line to use webrat's matchers -#require 'webrat/integrations/rspec-rails' +SPEC_ROOT = File.expand_path(File.dirname(__FILE__)) unless defined?(SPEC_ROOT) +ENV['SPEC_ROOT'] ||= SPEC_ROOT + +require File.join(SPEC_ROOT, 'blueprints') + +Dir[File.join(SPEC_ROOT,'support','**','*.rb')].each {|f| require f} -# Requires supporting files with custom matchers and macros, etc, -# in ./support/ and its subdirectories. -Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].each {|f| require f} Spec::Runner.configure do |config| - # If you're not using ActiveRecord you should remove these - # lines, delete config/database.yml and disable :active_record - # in your config/boot.rb config.use_transactional_fixtures = true config.use_instantiated_fixtures = false config.fixture_path = RAILS_ROOT + '/spec/fixtures/' - - # == Fixtures - # - # You can declare fixtures for each example_group like this: - # describe "...." do - # fixtures :table_a, :table_b - # - # Alternatively, if you prefer to declare them only once, you can - # do so right here. Just uncomment the next line and replace the fixture - # names with your fixtures. - # - # config.global_fixtures = :table_a, :table_b - # - # If you declare global fixtures, be aware that they will be declared - # for all of your examples, even those that don't use them. - # - # You can also declare which fixtures to use (for example fixtures for test/fixtures): - # - # config.fixture_path = RAILS_ROOT + '/spec/fixtures/' - # - # == Mock Framework - # - # RSpec uses its own mocking framework by default. 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 - # - # == Notes - # - # For more information take a look at Spec::Runner::Configuration and Spec::Runner end