fix referential creation in support

2 files changed, 30 insertions, 26 deletions

diff --git a/db/schema.rb b/db/schema.rb
index 944588d55..061b2d6d6 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20120620081755) do
+ActiveRecord::Schema.define(:version => 20120830095442) do
 
   create_table "access_links", :force => true do |t|
     t.integer  "access_point_id",                        :limit => 8
@@ -197,16 +197,6 @@ ActiveRecord::Schema.define(:version => 20120620081755) do
     t.datetime "updated_at",                 :null => false
   end
 
-  create_table "geometry_columns", :id => false, :force => true do |t|
-    t.string  "f_table_catalog",   :limit => 256, :null => false
-    t.string  "f_table_schema",    :limit => 256, :null => false
-    t.string  "f_table_name",      :limit => 256, :null => false
-    t.string  "f_geometry_column", :limit => 256, :null => false
-    t.integer "coord_dimension",                  :null => false
-    t.integer "srid",                             :null => false
-    t.string  "type",              :limit => 30,  :null => false
-  end
-
   create_table "group_of_lines", :force => true do |t|
     t.string   "objectid",       :null => false
     t.integer  "object_version"
@@ -308,6 +298,12 @@ ActiveRecord::Schema.define(:version => 20120620081755) do
   add_index "networks", ["objectid"], :name => "networks_objectid_key", :unique => true
   add_index "networks", ["registration_number"], :name => "networks_registration_number_key", :unique => true
 
+  create_table "organisations", :force => true do |t|
+    t.string   "name"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
   create_table "pt_links", :force => true do |t|
     t.integer  "start_of_link_id", :limit => 8
     t.integer  "end_of_link_id",   :limit => 8
@@ -331,8 +327,8 @@ ActiveRecord::Schema.define(:version => 20120620081755) do
     t.string   "prefix"
     t.string   "projection_type"
     t.string   "time_zone"
-    t.string   "the_geom"
     t.string   "bounds"
+    t.integer  "organisation_id"
   end
 
   create_table "routes", :force => true do |t|
@@ -357,14 +353,6 @@ ActiveRecord::Schema.define(:version => 20120620081755) do
     t.integer "line_id",      :limit => 8
   end
 
-  create_table "spatial_ref_sys", :id => false, :force => true do |t|
-    t.integer "srid",                      :null => false
-    t.string  "auth_name", :limit => 256
-    t.integer "auth_srid"
-    t.string  "srtext",    :limit => 2048
-    t.string  "proj4text", :limit => 2048
-  end
-
   create_table "stop_areas", :force => true do |t|
     t.integer  "parent_id",           :limit => 8
     t.string   "objectid",                                                         :null => false
@@ -459,18 +447,35 @@ ActiveRecord::Schema.define(:version => 20120620081755) do
   add_index "time_tables_vehicle_journeys", ["vehicle_journey_id"], :name => "index_time_tables_vehicle_journeys_on_vehicle_journey_id"
 
   create_table "users", :force => true do |t|
-    t.string   "email",                  :default => "", :null => false
-    t.string   "encrypted_password",     :default => "", :null => false
+    t.string   "email",                                :default => "", :null => false
+    t.string   "encrypted_password",                   :default => ""
     t.string   "reset_password_token"
     t.datetime "reset_password_sent_at"
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",          :default => 0
+    t.integer  "sign_in_count",                        :default => 0
     t.datetime "current_sign_in_at"
     t.datetime "last_sign_in_at"
     t.string   "current_sign_in_ip"
     t.string   "last_sign_in_ip"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.integer  "organisation_id"
+    t.string   "name"
+    t.string   "password_salt"
+    t.string   "confirmation_token"
+    t.datetime "confirmed_at"
+    t.datetime "confirmation_sent_at"
+    t.string   "unconfirmed_email"
+    t.integer  "failed_attempts",                      :default => 0
+    t.string   "unlock_token"
+    t.datetime "locked_at"
+    t.string   "authentication_token"
+    t.string   "invitation_token",       :limit => 60
+    t.datetime "invitation_sent_at"
+    t.datetime "invitation_accepted_at"
+    t.integer  "invitation_limit"
+    t.integer  "invited_by_id"
+    t.string   "invited_by_type"
   end
 
   add_index "users", ["email"], :name => "index_users_on_email", :unique => true
diff --git a/spec/support/referential.rb b/spec/support/referential.rb
index e74744fda..28f3799ec 100644
--- a/spec/support/referential.rb
+++ b/spec/support/referential.rb
@@ -29,10 +29,9 @@ RSpec.configure do |config|
   config.before(:suite) do
     organisation = Organisation.find_or_create_by_name :name => "first"
     organisation.referentials.find_by_slug("first" ) ||
-      Referential.create(:prefix => "first", :name => "first", 
-                         :slug => "first", :organisation => organisation) 
+      Referential.create(:prefix => "first", :name => "first", :slug => "first", :organisation => organisation) 
     # FIXME in Rails 3.2 :
-    # Referential.where(:slug => 'first').first_or_create(attributes_for(:referential))
+    # Referential.where(:slug => 'first').first_or_create(FactoryGirl.attributes_for(:referential))
   end
 
   config.before(:each) do