Use FactoryGirl 2.0 syntax. Refs #13

7 files changed, 46 insertions, 38 deletions

diff --git a/spec/factories.rb b/spec/factories.rb
new file mode 100644
index 000000000..b09e41c5c
--- /dev/null
+++ b/spec/factories.rb
@@ -0,0 +1,46 @@
+FactoryGirl.define do
+  factory :company, :class => "Chouette::Company" do |company|
+    company.sequence(:name) { |n| "Company #{n}" }
+    company.sequence(:objectid) { |n| "test:Company:#{n}" }
+    company.sequence(:registration_number) { |n| "test-#{n}" }
+
+  end
+
+  factory :line, :class => "Chouette::Line" do |line|
+    line.sequence(:name) { |n| "Line #{n}" }
+    line.sequence(:objectid) { |n| "test:Line:#{n}" }
+    line.sequence(:transport_mode_name) { |n| "Bus" }
+
+    line.association :network, :factory => :network
+    line.association :company, :factory => :company
+
+    line.sequence(:registration_number) { |n| "test-#{n}" }
+  end
+
+  factory :network, :class => "Chouette::Network" do |network|
+    network.sequence(:name) { |n| "Network #{n}" }
+    network.sequence(:objectid) { |n| "test:GroupOfLine:#{n}" }
+    network.sequence(:registration_number) { |n| "test-#{n}" }
+
+  end
+
+  # factory :chouette_stop_area, :class => "Chouette::StopArea" do |f|
+  #   f.latitude 10 * rand
+  #   f.longitude 10 * rand
+  #   f.sequence(:name) { |n| "StopArea #{n}" }
+  #   f.areatype "CommercialStopPoint"
+  #   f.objectid
+  # end
+
+  factory :referential do |f|
+    f.sequence(:name) { |n| "Test #{n}" }
+    f.sequence(:slug) { |n| "test_#{n}" }
+  end
+
+  factory :user do |f|
+    f.sequence(:email) { |n| "chouette#{n}@dryade.priv" }
+    f.password "secret"
+    f.password_confirmation "secret"
+  end
+
+end
diff --git a/spec/factories/chouette_companies.rb b/spec/factories/chouette_companies.rb
deleted file mode 100644
index 62c02e65a..000000000
--- a/spec/factories/chouette_companies.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-Factory.define :company, :class => "Chouette::Company" do |company|
-  company.sequence(:name) { |n| "Company #{n}" }
-  company.sequence(:objectid) { |n| "test:Company:#{n}" }
-  company.sequence(:registration_number) { |n| "test-#{n}" }
-
-end
diff --git a/spec/factories/chouette_lines.rb b/spec/factories/chouette_lines.rb
deleted file mode 100644
index 03faeedae..000000000
--- a/spec/factories/chouette_lines.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-Factory.define :line, :class => "Chouette::Line" do |line|
-  line.sequence(:name) { |n| "Line #{n}" }
-  line.sequence(:objectid) { |n| "test:Line:#{n}" }
-  line.sequence(:transport_mode_name) { |n| "Bus" }
-
-  line.association :network, :factory => :network
-  line.association :company, :factory => :company
-
-  line.sequence(:registration_number) { |n| "test-#{n}" }
-end
diff --git a/spec/factories/chouette_networks.rb b/spec/factories/chouette_networks.rb
deleted file mode 100644
index 41cc3ac1b..000000000
--- a/spec/factories/chouette_networks.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-Factory.define :network, :class => "Chouette::Network" do |network|
-  network.sequence(:name) { |n| "Network #{n}" }
-  network.sequence(:objectid) { |n| "test:GroupOfLine:#{n}" }
-  network.sequence(:registration_number) { |n| "test-#{n}" }
-
-end
diff --git a/spec/factories/chouette_stop_areas.rb b/spec/factories/chouette_stop_areas.rb
deleted file mode 100644
index ede1c7767..000000000
--- a/spec/factories/chouette_stop_areas.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# Factory.define :chouette_stop_area, :class => "Chouette::StopArea" do |f|
-#   f.latitude 10 * rand
-#   f.longitude 10 * rand
-#   f.sequence(:name) { |n| "StopArea #{n}" }
-#   f.areatype "CommercialStopPoint"
-#   f.objectid
-# end
\ No newline at end of file
diff --git a/spec/factories/referential.rb b/spec/factories/referential.rb
deleted file mode 100644
index 5c87a5427..000000000
--- a/spec/factories/referential.rb
+++ /dev/null
@@ -1,4 +0,0 @@
-Factory.define :referential do |f|
-  f.sequence(:name) { |n| "Test #{n}" }
-  f.sequence(:slug) { |n| "test_#{n}" }
-end
diff --git a/spec/factories/user.rb b/spec/factories/user.rb
deleted file mode 100644
index e6a00c6af..000000000
--- a/spec/factories/user.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-Factory.define :user do |f|
-  f.sequence(:email) { |n| "chouette#{n}@dryade.priv" }
-  f.password "secret"
-  f.password_confirmation "secret"
-end