merge V3_0

2 files changed, 39 insertions, 8 deletions

diff --git a/spec/models/export_task_spec.rb b/spec/models/export_task_spec.rb
new file mode 100644
index 000000000..1a52a6175
--- /dev/null
+++ b/spec/models/export_task_spec.rb
@@ -0,0 +1,8 @@
+require 'spec_helper'
+
+describe ExportTask, :type => :model do
+
+  it { should_not validate_presence_of(:start_date) }
+  it { should_not validate_presence_of(:end_date) }
+
+end
diff --git a/spec/models/gtfs_export_spec.rb b/spec/models/gtfs_export_spec.rb
index a5e5d0335..6051497a7 100644
--- a/spec/models/gtfs_export_spec.rb
+++ b/spec/models/gtfs_export_spec.rb
@@ -1,10 +1,33 @@
-# require 'spec_helper'
+require 'spec_helper'
 
-# describe GtfsExport, :type => :model do
+describe GtfsExport, :type => :model do
 
-#   describe '#export_options' do
-#     subject { super().export_options }
-#     it { is_expected.to include(:format => :gtfs) }
-#   end
-  
-# end
+  describe "#time_zone" do
+
+    context "when exported data are not StopAreas" do
+
+      before do
+        subject.references_type = "network"
+      end
+
+      it "should be mandatory" do
+        subject.should validate_presence_of(:time_zone)
+      end
+
+    end
+
+    context "when export data are StopArea" do
+
+      before do
+        subject.references_type = "stop_area"
+      end
+
+      it "should be mandatory" do
+        subject.should_not validate_presence_of(:time_zone)
+      end
+
+    end
+
+  end
+
+end