@@ -9,7 +9,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20090511004030) do +ActiveRecord::Schema.define(:version => 20090423230345) do create_table "bj_config", :primary_key => "bj_config_id", :force => true do |t| t.string "hostname" @@ -69,6 +69,11 @@ ActiveRecord::Schema.define(:version => 20090511004030) do t.datetime "updated_at" end + create_table "can_search_record", :force => true do |t| + t.integer "parent_id" + t.datetime "created_at" + end + create_table "contexts", :force => true do |t| t.string "name" t.integer "user_id" @@ -143,9 +148,13 @@ ActiveRecord::Schema.define(:version => 20090511004030) do end create_table "open_id_authentication_nonces", :force => true do |t| - t.integer "timestamp", :null => false - t.string "server_url" - t.string "salt", :null => false + t.string "nonce" + t.integer "created" + end + + create_table "open_id_authentication_settings", :force => true do |t| + t.string "setting" + t.binary "value" end create_table "projects", :force => true do |t| @@ -165,7 +174,7 @@ ActiveRecord::Schema.define(:version => 20090511004030) do t.integer "user_id" t.decimal "hours", :precision => 8, :scale => 2, :default => 0.0 t.string "message" - t.string "aasm_state" + t.string "state" t.datetime "created_at" t.datetime "updated_at" t.integer "project_id" @@ -195,7 +204,7 @@ ActiveRecord::Schema.define(:version => 20090511004030) do t.datetime "remember_token_expires_at" t.string "activation_code", :limit => 40 t.datetime "activated_at" - t.string "aasm_state", :default => "passive" + t.string "state", :default => "passive" t.datetime "deleted_at" t.boolean "admin", :default => false t.integer "last_status_project_id" db/schema.rb @@ -2,7 +2,7 @@ ModelStubbing.define_models do time 2007, 6, 15, 6 model User do - stub :login => 'normal-user', :email => 'normal-user@example.com', :aasm_state => 'active', + stub :login => 'normal-user', :email => 'normal-user@example.com', :state => 'active', :salt => '7e3041ebc2fc05a40c60028e2c4901a81035d3cd', :crypted_password => '00742970dc9e6319f8019fd54864d3ea740f04b1', :created_at => current_time - 5.days, :remember_token => 'foo-bar', :remember_token_expires_at => current_time + 5.days, :activation_code => '8f24789ae988411ccf33ab0c30fe9106fab32e9b', :activated_at => current_time - 4.days, :time_zone => "UTC", @@ -15,7 +15,7 @@ ModelStubbing.define_models do end model Status do - stub :user => all_stubs(:user), :message => 'default', :aasm_state => 'processed', :hours => 5, :created_at => current_time - 2.days + stub :user => all_stubs(:user), :message => 'default', :state => 'processed', :hours => 5, :created_at => current_time - 2.days stub :in_project, :message => '@abc in-project', :created_at => current_time - 47.hours, :project => all_stubs(:project) end spec/model_stubs.rb @@ -1,7 +1,7 @@ require File.dirname(__FILE__) + '/../spec_helper' describe Membership do - define_models :memberships do + define_models :memberships, :copy => :default do model Membership do stub :user => all_stubs(:user), :project => all_stubs(:another_project), :code => 'foo' end spec/models/membership_spec.rb 9f7769baf66fddb2dcdfb30f51badfe9e539e744 rick technoweenie@gmail.com http://github.com/entp/xtt/commit/2afe45c285fb3e9e64509bbb6a49509405bd0fd4 2afe45c285fb3e9e64509bbb6a49509405bd0fd4 2009-06-12T10:10:27-07:00 2009-06-12T10:10:27-07:00 fix Membership.create! spec 6a0e757098f00463db5b0c89c24500257f60accf rick technoweenie@gmail.com