test/factories/account.rb test/factories/comment.rb test/factories/game.rb test/factories/match.rb test/factories/user.rb test/functional/games_controller_test.rb @@ -14,4 +14,5 @@ public/mugshots .project .loadpath nbproject -vendor/plugins/goldspike \ No newline at end of file +vendor/plugins/goldspike +db/*.sqlite3 .gitignore @@ -8,6 +8,3 @@ require 'rake/testtask' require 'rake/rdoctask' require 'tasks/rails' - -Rake::Task[:default].prerequisites.clear -task :default => :spec \ No newline at end of file Rakefile @@ -27,8 +27,7 @@ Rails::Initializer.run do |config| config.gem 'color-tools', :lib => 'color' config.gem 'haml' config.gem 'thoughtbot-factory_girl', :lib => 'factory_girl', :source => 'http://gems.github.com' - config.gem 'rspec', :lib => 'spec' - config.gem 'rspec-rails', :lib => 'spec/rails' + config.gem "thoughtbot-shoulda", :lib => "shoulda", :source => "http://gems.github.com" config.gem 'jeremymcanally-context', :lib => 'context', :source => 'http://gems.github.com' config.gem 'jeremymcanally-matchy', :lib => 'matchy', :source => 'http://gems.github.com' config/environment.rb @@ -28,8 +28,8 @@ ActiveRecord::Schema.define(:version => 20081006194834) do t.datetime "updated_at" end - add_index "comments", ["user_id"], :name => "index_comments_on_user_id" add_index "comments", ["match_id"], :name => "index_comments_on_game_id" + add_index "comments", ["user_id"], :name => "index_comments_on_user_id" create_table "game_participations", :force => true do |t| t.integer "user_id" @@ -55,8 +55,6 @@ ActiveRecord::Schema.define(:version => 20081006194834) do t.integer "matches_count", :default => 0 end - add_index "games", ["account_id"], :name => "index_games_on_account_id" - create_table "logs", :force => true do |t| t.integer "account_id" t.integer "user_id" @@ -70,8 +68,8 @@ ActiveRecord::Schema.define(:version => 20081006194834) do end add_index "logs", ["account_id"], :name => "index_logs_on_account_id" - add_index "logs", ["published_at"], :name => "index_logs_on_published_at" add_index "logs", ["game_id"], :name => "index_logs_on_game_id" + add_index "logs", ["published_at"], :name => "index_logs_on_published_at" create_table "matches", :force => true do |t| t.datetime "played_at" @@ -87,10 +85,10 @@ ActiveRecord::Schema.define(:version => 20081006194834) do t.integer "game_id" end - add_index "matches", ["played_on"], :name => "index_games_on_played_on" add_index "matches", ["account_id"], :name => "index_games_on_account_id" add_index "matches", ["game_id"], :name => "index_matches_on_game_id" add_index "matches", ["played_at"], :name => "index_matches_on_played_at" + add_index "matches", ["played_on"], :name => "index_games_on_played_on" add_index "matches", ["team_one"], :name => "index_matches_on_team_one" add_index "matches", ["team_two"], :name => "index_matches_on_team_two" @@ -105,9 +103,9 @@ ActiveRecord::Schema.define(:version => 20081006194834) do t.integer "game_participation_id" end - add_index "memberships", ["user_id"], :name => "index_memberships_on_person_id" add_index "memberships", ["game_id"], :name => "index_memberships_on_game_id" add_index "memberships", ["game_participation_id"], :name => "index_memberships_on_game_participation_id" + add_index "memberships", ["user_id"], :name => "index_memberships_on_person_id" create_table "mugshots", :force => true do |t| t.integer "size" @@ -142,9 +140,9 @@ ActiveRecord::Schema.define(:version => 20081006194834) do t.integer "account_id" end - add_index "teams", ["team_ids"], :name => "index_teams_on_team_ids" - add_index "teams", ["opponent_ids"], :name => "index_teams_on_opponent_ids" add_index "teams", ["account_id"], :name => "index_teams_on_account_id" + add_index "teams", ["opponent_ids"], :name => "index_teams_on_opponent_ids" + add_index "teams", ["team_ids"], :name => "index_teams_on_team_ids" create_table "users", :force => true do |t| t.string "login" db/schema.rb @@ -2,10 +2,9 @@ ENV["RAILS_ENV"] = "test" require File.expand_path(File.dirname(__FILE__) + "/../config/environment") require 'test_help' -include AuthenticatedTestHelper -require File.join(Rails.root, 'spec/factories') +class ActiveSupport::TestCase + include AuthenticatedTestHelper -class Test::Unit::TestCase # Transactional fixtures accelerate your tests by wrapping each test method # in a transaction that's rolled back on completion. This ensures that the # test database remains unchanged so your fixtures don't have to be reloaded @@ -35,7 +34,7 @@ class Test::Unit::TestCase # # Note: You'll currently still have to declare fixtures explicitly in integration tests # -- they do not yet inherit this setting - fixtures :all + # fixtures :all # Add more helper methods to be used by all tests here... end test/test_helper.rb lang/da.yaml spec/controllers/accounts_controller_spec.rb spec/controllers/comments_controller_spec.rb spec/controllers/comparisons_controller_spec.rb spec/controllers/dashboard_controller_spec.rb spec/controllers/games_controller_spec.rb spec/controllers/logs_controller_spec.rb spec/controllers/matches_controller_spec.rb spec/controllers/pages_controller_spec.rb spec/controllers/sessions_controller_spec.rb spec/controllers/teams_controller_spec.rb spec/controllers/users_controller_spec.rb spec/factories.rb spec/helpers/accounts_helper_spec.rb spec/helpers/comments_helper_spec.rb spec/helpers/comparisons_helper_spec.rb spec/helpers/dashboard_helper_spec.rb spec/helpers/games_helper_spec.rb spec/helpers/logs_helper_spec.rb spec/helpers/matches_helper_spec.rb spec/helpers/pages_helper_spec.rb spec/helpers/people_helper_spec.rb spec/helpers/teams_helper_spec.rb spec/models/game_spec.rb spec/models/match_spec.rb spec/models/membership_spec.rb spec/models/mugshot_spec.rb spec/models/news_item_spec.rb spec/models/team_spec.rb spec/models/user_spec.rb spec/rcov.opts spec/spec.opts spec/spec_helper.rb spec/views/matches/index_atom_builder_spec.rb stories/accounts/signing_up.rb stories/all.rb stories/helper.rb stories/matches/creating_a_match.rb test/integration/first_login_test.rb test/integration/public_content_test.rb 676b6ff3dea78962c4b9ab1db800228ffea0f7c1 Lars G. Sehested lars@larssehested.com http://github.com/larssg/score-keeper/commit/b27e772e0aa7876e6b03c9a08d88799606b2af26 b27e772e0aa7876e6b03c9a08d88799606b2af26 2009-06-27T04:24:09-07:00 2009-06-27T04:24:09-07:00 Remove RSpec files - converting to Shoulda 4352ad7f072de6bcd97711fabb361ca05e155fd2 Lars G. Sehested lars@larssehested.com