From f22eb60cfbcfee65ead775ceae6e3afc2809fcd3 Mon Sep 17 00:00:00 2001
From: Alban Peignier
Date: Sun, 27 Aug 2017 15:57:05 +0200
Subject: Update OFFRE_TRANSDEV_2017030112251.zip to use calendriers.xml.
 Update regression_4273_spec fixture files. Ignore target files. Refs #4273

---
 .gitignore                                         |   3 +
 .../calendrier.xml                                 |  86 ---------------------
 .../calendriers.xml                                |  86 +++++++++++++++++++++
 .../calendrier.xml                                 |  80 -------------------
 .../calendriers.xml                                |  80 +++++++++++++++++++
 .../target_OFFRE_TRANSDEV_20170301122517.zip       | Bin 5446 -> 0 bytes
 .../target_OFFRE_TRANSDEV_20170301122519.zip       | Bin 5249 -> 0 bytes
 7 files changed, 169 insertions(+), 166 deletions(-)
 delete mode 100644 spec/fixtures/source_OFFRE_TRANSDEV_20170301122517/calendrier.xml
 create mode 100644 spec/fixtures/source_OFFRE_TRANSDEV_20170301122517/calendriers.xml
 delete mode 100644 spec/fixtures/source_OFFRE_TRANSDEV_20170301122519/calendrier.xml
 create mode 100644 spec/fixtures/source_OFFRE_TRANSDEV_20170301122519/calendriers.xml
 delete mode 100644 spec/fixtures/target_OFFRE_TRANSDEV_20170301122517.zip
 delete mode 100644 spec/fixtures/target_OFFRE_TRANSDEV_20170301122519.zip

diff --git a/.gitignore b/.gitignore
index 0cdaa7c9f..29cc18f2e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,6 @@ bin/
 /bin/rake
 /bin/rails
 /bin/rspec
+
+# FIXME Ignore ./spec/services/zip_service/regression_4273_spec.rb files
+/spec/fixtures/target_*.zip
\ No newline at end of file
diff --git a/spec/fixtures/source_OFFRE_TRANSDEV_20170301122517/calendrier.xml b/spec/fixtures/source_OFFRE_TRANSDEV_20170301122517/calendrier.xml
deleted file mode 100644
index bfbd0aea1..000000000
--- a/spec/fixtures/source_OFFRE_TRANSDEV_20170301122517/calendrier.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<netex:PublicationDelivery xmlns:netex="http://www.netex.org.uk/netex"
-    xmlns:siri="http://www.siri.org.uk/siri" xmlns:core="http://www.govtalk.gov.uk/core"
-    xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:ifopt="http://www.ifopt.org.uk/ifopt"
-    xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    version="1.0">
-    <netex:PublicationTimestamp>2017-02-14T09:13:51.0</netex:PublicationTimestamp>
-    <netex:ParticipantRef>CITYWAY</netex:ParticipantRef>
-    <netex:dataObjects>
-        <netex:GeneralFrame id="CITYWAY:GeneralFrame:NETEX_CALENDRIER-1_20170214090012:LOC"
-            version="any">
-            <netex:TypeOfFrameRef ref="NETEX_CALENDRIER"/>
-            <netex:ValidBetween>
-                <netex:FromDate>2017-03-01</netex:FromDate>
-                <netex:ToDate>2017-03-31</netex:ToDate>
-            </netex:ValidBetween>
-            <netex:members> 
-                <netex:dayTypes>
-                    <netex:DayType id="CITYWAY:DayType:1:LOC"  version="any" >
-                        <netex:Name>Semaine</netex:Name>
-                        <netex:properties>
-                            <netex:PropertyOfDay>
-                                <netex:DaysOfWeek>Monday</netex:DaysOfWeek>
-                            </netex:PropertyOfDay>
-                            <netex:PropertyOfDay>
-                                <netex:DaysOfWeek>Tuesday</netex:DaysOfWeek>
-                            </netex:PropertyOfDay>
-                            <netex:PropertyOfDay>
-                                <netex:DaysOfWeek>Wednesday</netex:DaysOfWeek>
-                            </netex:PropertyOfDay>
-                            <netex:PropertyOfDay>
-                                <netex:DaysOfWeek>Thursday</netex:DaysOfWeek>
-                            </netex:PropertyOfDay>
-                            <netex:PropertyOfDay>
-                                <netex:DaysOfWeek>Friday</netex:DaysOfWeek>
-                            </netex:PropertyOfDay>
-                        </netex:properties>
-                    </netex:DayType>                    
-                    <netex:DayType id="CITYWAY:DayType:2:LOC"  version="any" >
-                        <netex:Name>Fin de semaine</netex:Name>
-                        <netex:properties>
-                            <netex:PropertyOfDay>
-                                <netex:DaysOfWeek>Saturday</netex:DaysOfWeek>
-                            </netex:PropertyOfDay>
-                            <netex:PropertyOfDay>
-                                <netex:DaysOfWeek>Sunday</netex:DaysOfWeek>
-                            </netex:PropertyOfDay>
-                        </netex:properties>
-                    </netex:DayType>                    
-                    <netex:DayType id="CITYWAY:DayType:3:LOC"  version="any" >
-                        <netex:Name>Service spécial</netex:Name>
-                    </netex:DayType>                    
-                    <netex:DayType id="CITYWAY:DayType:4:LOC"  version="any" >
-                        <netex:Name>Restriction</netex:Name>
-                    </netex:DayType>                    
-                </netex:dayTypes>
-                <netex:dayTypeAssignments>
-                    <netex:DayTypeAssignment version="any" >
-                        <netex:OperatingPeriodRef ref="CITYWAY:OperatingPeriod:1:LOC" version="any"/>
-                        <netex:DayTypeRef ref="CITYWAY:DayType:1:LOC" version="any"/>
-                    </netex:DayTypeAssignment>
-                    <netex:DayTypeAssignment version="any" >
-                        <netex:OperatingPeriodRef ref="CITYWAY:OperatingPeriod:1:LOC" version="any"/>
-                        <netex:DayTypeRef ref="CITYWAY:DayType:2:LOC" version="any"/>
-                    </netex:DayTypeAssignment>
-                    <netex:DayTypeAssignment version="any" >
-                        <netex:Date>2017-03-15</netex:Date>
-                        <netex:DayTypeRef ref="CITYWAY:DayType:3:LOC" version="any"/>
-                        <netex:isAvailable>true</netex:isAvailable> 
-                    </netex:DayTypeAssignment>
-                    <netex:DayTypeAssignment version="any" >
-                        <netex:Date>2017-03-15</netex:Date>
-                        <netex:DayTypeRef ref="CITYWAY:DayType:4:LOC" version="any"/>
-                        <netex:isAvailable>false</netex:isAvailable> 
-                    </netex:DayTypeAssignment>
-                </netex:dayTypeAssignments>
-                <netex:operatingPeriods>
-                    <netex:OperatingPeriod id="CITYWAY:OperatingPeriod:1:LOC" version="any" >
-                        <netex:FromDate>2017-01-01</netex:FromDate>
-                        <netex:ToDate>2017-12-31</netex:ToDate>
-                    </netex:OperatingPeriod>
-                </netex:operatingPeriods>
-            </netex:members>
-        </netex:GeneralFrame>
-    </netex:dataObjects>
-</netex:PublicationDelivery>
diff --git a/spec/fixtures/source_OFFRE_TRANSDEV_20170301122517/calendriers.xml b/spec/fixtures/source_OFFRE_TRANSDEV_20170301122517/calendriers.xml
new file mode 100644
index 000000000..bfbd0aea1
--- /dev/null
+++ b/spec/fixtures/source_OFFRE_TRANSDEV_20170301122517/calendriers.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<netex:PublicationDelivery xmlns:netex="http://www.netex.org.uk/netex"
+    xmlns:siri="http://www.siri.org.uk/siri" xmlns:core="http://www.govtalk.gov.uk/core"
+    xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:ifopt="http://www.ifopt.org.uk/ifopt"
+    xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    version="1.0">
+    <netex:PublicationTimestamp>2017-02-14T09:13:51.0</netex:PublicationTimestamp>
+    <netex:ParticipantRef>CITYWAY</netex:ParticipantRef>
+    <netex:dataObjects>
+        <netex:GeneralFrame id="CITYWAY:GeneralFrame:NETEX_CALENDRIER-1_20170214090012:LOC"
+            version="any">
+            <netex:TypeOfFrameRef ref="NETEX_CALENDRIER"/>
+            <netex:ValidBetween>
+                <netex:FromDate>2017-03-01</netex:FromDate>
+                <netex:ToDate>2017-03-31</netex:ToDate>
+            </netex:ValidBetween>
+            <netex:members> 
+                <netex:dayTypes>
+                    <netex:DayType id="CITYWAY:DayType:1:LOC"  version="any" >
+                        <netex:Name>Semaine</netex:Name>
+                        <netex:properties>
+                            <netex:PropertyOfDay>
+                                <netex:DaysOfWeek>Monday</netex:DaysOfWeek>
+                            </netex:PropertyOfDay>
+                            <netex:PropertyOfDay>
+                                <netex:DaysOfWeek>Tuesday</netex:DaysOfWeek>
+                            </netex:PropertyOfDay>
+                            <netex:PropertyOfDay>
+                                <netex:DaysOfWeek>Wednesday</netex:DaysOfWeek>
+                            </netex:PropertyOfDay>
+                            <netex:PropertyOfDay>
+                                <netex:DaysOfWeek>Thursday</netex:DaysOfWeek>
+                            </netex:PropertyOfDay>
+                            <netex:PropertyOfDay>
+                                <netex:DaysOfWeek>Friday</netex:DaysOfWeek>
+                            </netex:PropertyOfDay>
+                        </netex:properties>
+                    </netex:DayType>                    
+                    <netex:DayType id="CITYWAY:DayType:2:LOC"  version="any" >
+                        <netex:Name>Fin de semaine</netex:Name>
+                        <netex:properties>
+                            <netex:PropertyOfDay>
+                                <netex:DaysOfWeek>Saturday</netex:DaysOfWeek>
+                            </netex:PropertyOfDay>
+                            <netex:PropertyOfDay>
+                                <netex:DaysOfWeek>Sunday</netex:DaysOfWeek>
+                            </netex:PropertyOfDay>
+                        </netex:properties>
+                    </netex:DayType>                    
+                    <netex:DayType id="CITYWAY:DayType:3:LOC"  version="any" >
+                        <netex:Name>Service spécial</netex:Name>
+                    </netex:DayType>                    
+                    <netex:DayType id="CITYWAY:DayType:4:LOC"  version="any" >
+                        <netex:Name>Restriction</netex:Name>
+                    </netex:DayType>                    
+                </netex:dayTypes>
+                <netex:dayTypeAssignments>
+                    <netex:DayTypeAssignment version="any" >
+                        <netex:OperatingPeriodRef ref="CITYWAY:OperatingPeriod:1:LOC" version="any"/>
+                        <netex:DayTypeRef ref="CITYWAY:DayType:1:LOC" version="any"/>
+                    </netex:DayTypeAssignment>
+                    <netex:DayTypeAssignment version="any" >
+                        <netex:OperatingPeriodRef ref="CITYWAY:OperatingPeriod:1:LOC" version="any"/>
+                        <netex:DayTypeRef ref="CITYWAY:DayType:2:LOC" version="any"/>
+                    </netex:DayTypeAssignment>
+                    <netex:DayTypeAssignment version="any" >
+                        <netex:Date>2017-03-15</netex:Date>
+                        <netex:DayTypeRef ref="CITYWAY:DayType:3:LOC" version="any"/>
+                        <netex:isAvailable>true</netex:isAvailable> 
+                    </netex:DayTypeAssignment>
+                    <netex:DayTypeAssignment version="any" >
+                        <netex:Date>2017-03-15</netex:Date>
+                        <netex:DayTypeRef ref="CITYWAY:DayType:4:LOC" version="any"/>
+                        <netex:isAvailable>false</netex:isAvailable> 
+                    </netex:DayTypeAssignment>
+                </netex:dayTypeAssignments>
+                <netex:operatingPeriods>
+                    <netex:OperatingPeriod id="CITYWAY:OperatingPeriod:1:LOC" version="any" >
+                        <netex:FromDate>2017-01-01</netex:FromDate>
+                        <netex:ToDate>2017-12-31</netex:ToDate>
+                    </netex:OperatingPeriod>
+                </netex:operatingPeriods>
+            </netex:members>
+        </netex:GeneralFrame>
+    </netex:dataObjects>
+</netex:PublicationDelivery>
diff --git a/spec/fixtures/source_OFFRE_TRANSDEV_20170301122519/calendrier.xml b/spec/fixtures/source_OFFRE_TRANSDEV_20170301122519/calendrier.xml
deleted file mode 100644
index dc57aea11..000000000
--- a/spec/fixtures/source_OFFRE_TRANSDEV_20170301122519/calendrier.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<netex:PublicationDelivery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.netex.org.uk/netex ../../xsd/NeTEx_publication.xsd" xmlns:netex="http://www.netex.org.uk/netex"
-    xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ifopt="http://www.ifopt.org.uk/ifopt"
-    xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:core="http://www.govtalk.gov.uk/core"
-    xmlns:siri="http://www.siri.org.uk/siri" version="1.0">
-    <netex:PublicationTimestamp>2017-02-14T09:13:51.0</netex:PublicationTimestamp>
-    <netex:ParticipantRef>CITYWAY</netex:ParticipantRef>
-    <netex:dataObjects>
-        <netex:GeneralFrame id="CITYWAY:GeneralFrame:NETEX_CALENDRIER-1_20170214090012:LOC" version="any">
-            <netex:ValidBetween>
-                <netex:FromDate>2017-03-01T00:00:00</netex:FromDate>
-                <netex:ToDate>2017-12-31T00:00:00</netex:ToDate>
-            </netex:ValidBetween>
-            <netex:TypeOfFrameRef ref="NETEX_CALENDRIER"/>
-            <netex:members>
-                <netex:DayType id="CITYWAY:DayType:1:LOC" version="any">
-                    <netex:Name>Semaine</netex:Name>
-                    <netex:properties>
-                        <netex:PropertyOfDay>
-                            <netex:DaysOfWeek>Monday</netex:DaysOfWeek>
-                        </netex:PropertyOfDay>
-                        <netex:PropertyOfDay>
-                            <netex:DaysOfWeek>Tuesday</netex:DaysOfWeek>
-                        </netex:PropertyOfDay>
-                        <netex:PropertyOfDay>
-                            <netex:DaysOfWeek>Wednesday</netex:DaysOfWeek>
-                        </netex:PropertyOfDay>
-                        <netex:PropertyOfDay>
-                            <netex:DaysOfWeek>Thursday</netex:DaysOfWeek>
-                        </netex:PropertyOfDay>
-                        <netex:PropertyOfDay>
-                            <netex:DaysOfWeek>Friday</netex:DaysOfWeek>
-                        </netex:PropertyOfDay>
-                    </netex:properties>
-                </netex:DayType>
-                <netex:DayType id="CITYWAY:DayType:2:LOC" version="any">
-                    <netex:Name>Fin de semaine</netex:Name>
-                    <netex:properties>
-                        <netex:PropertyOfDay>
-                            <netex:DaysOfWeek>Saturday</netex:DaysOfWeek>
-                        </netex:PropertyOfDay>
-                        <netex:PropertyOfDay>
-                            <netex:DaysOfWeek>Sunday</netex:DaysOfWeek>
-                        </netex:PropertyOfDay>
-                    </netex:properties>
-                </netex:DayType>
-                <netex:DayType id="CITYWAY:DayType:3:LOC" version="any">
-                    <netex:Name>Service spécial</netex:Name>
-                </netex:DayType>
-                <netex:DayType id="CITYWAY:DayType:4:LOC" version="any">
-                    <netex:Name>Restriction</netex:Name>
-                </netex:DayType>
-                <netex:DayTypeAssignment id="dta1" version="any" order="0">
-                    <netex:OperatingPeriodRef ref="CITYWAY:OperatingPeriod:1:LOC" version="any"/>
-                    <netex:DayTypeRef ref="CITYWAY:DayType:1:LOC" version="any"/>
-                </netex:DayTypeAssignment>
-                <netex:DayTypeAssignment id="dta2" version="any" order="0">
-                    <netex:OperatingPeriodRef ref="CITYWAY:OperatingPeriod:1:LOC" version="any"/>
-                    <netex:DayTypeRef ref="CITYWAY:DayType:2:LOC" version="any"/>
-                </netex:DayTypeAssignment>
-                <netex:DayTypeAssignment id="dta3" version="any" order="0">
-                    <netex:Date>2017-03-15</netex:Date>
-                    <netex:DayTypeRef ref="CITYWAY:DayType:3:LOC" version="any"/>
-                    <netex:isAvailable>true</netex:isAvailable>
-                </netex:DayTypeAssignment>
-                <netex:DayTypeAssignment id="dta4" version="any" order="0">
-                    <netex:Date>2017-03-15</netex:Date>
-                    <netex:DayTypeRef ref="CITYWAY:DayType:4:LOC" version="any"/>
-                    <netex:isAvailable>false</netex:isAvailable>
-                </netex:DayTypeAssignment>
-                <netex:OperatingPeriod id="CITYWAY:OperatingPeriod:1:LOC" version="any">
-                    <netex:FromDate>2017-01-01T00:00:00</netex:FromDate>
-                    <netex:ToDate>2017-12-31T00:00:00</netex:ToDate>
-                </netex:OperatingPeriod>
-
-            </netex:members>
-        </netex:GeneralFrame>
-    </netex:dataObjects>
-</netex:PublicationDelivery>
diff --git a/spec/fixtures/source_OFFRE_TRANSDEV_20170301122519/calendriers.xml b/spec/fixtures/source_OFFRE_TRANSDEV_20170301122519/calendriers.xml
new file mode 100644
index 000000000..1043e0cde
--- /dev/null
+++ b/spec/fixtures/source_OFFRE_TRANSDEV_20170301122519/calendriers.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<netex:PublicationDelivery xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.netex.org.uk/netex ../../xsd/NeTEx_publication.xsd" xmlns:netex="http://www.netex.org.uk/netex"
+    xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ifopt="http://www.ifopt.org.uk/ifopt"
+    xmlns:gml="http://www.opengis.net/gml/3.2" xmlns:core="http://www.govtalk.gov.uk/core"
+    xmlns:siri="http://www.siri.org.uk/siri" version="1.0">
+    <netex:PublicationTimestamp>2017-02-14T09:13:51.0</netex:PublicationTimestamp>
+    <netex:ParticipantRef>CITYWAY</netex:ParticipantRef>
+    <netex:dataObjects>
+        <netex:GeneralFrame id="CITYWAY:GeneralFrame:NETEX_CALENDRIER-1_20170214090012:LOC" version="any">
+            <netex:ValidBetween>
+                <netex:FromDate>2017-04-01T00:00:00</netex:FromDate>
+                <netex:ToDate>2017-12-31T00:00:00</netex:ToDate>
+            </netex:ValidBetween>
+            <netex:TypeOfFrameRef ref="NETEX_CALENDRIER"/>
+            <netex:members>
+                <netex:DayType id="CITYWAY:DayType:1:LOC" version="any">
+                    <netex:Name>Semaine</netex:Name>
+                    <netex:properties>
+                        <netex:PropertyOfDay>
+                            <netex:DaysOfWeek>Monday</netex:DaysOfWeek>
+                        </netex:PropertyOfDay>
+                        <netex:PropertyOfDay>
+                            <netex:DaysOfWeek>Tuesday</netex:DaysOfWeek>
+                        </netex:PropertyOfDay>
+                        <netex:PropertyOfDay>
+                            <netex:DaysOfWeek>Wednesday</netex:DaysOfWeek>
+                        </netex:PropertyOfDay>
+                        <netex:PropertyOfDay>
+                            <netex:DaysOfWeek>Thursday</netex:DaysOfWeek>
+                        </netex:PropertyOfDay>
+                        <netex:PropertyOfDay>
+                            <netex:DaysOfWeek>Friday</netex:DaysOfWeek>
+                        </netex:PropertyOfDay>
+                    </netex:properties>
+                </netex:DayType>
+                <netex:DayType id="CITYWAY:DayType:2:LOC" version="any">
+                    <netex:Name>Fin de semaine</netex:Name>
+                    <netex:properties>
+                        <netex:PropertyOfDay>
+                            <netex:DaysOfWeek>Saturday</netex:DaysOfWeek>
+                        </netex:PropertyOfDay>
+                        <netex:PropertyOfDay>
+                            <netex:DaysOfWeek>Sunday</netex:DaysOfWeek>
+                        </netex:PropertyOfDay>
+                    </netex:properties>
+                </netex:DayType>
+                <netex:DayType id="CITYWAY:DayType:3:LOC" version="any">
+                    <netex:Name>Service spécial</netex:Name>
+                </netex:DayType>
+                <netex:DayType id="CITYWAY:DayType:4:LOC" version="any">
+                    <netex:Name>Restriction</netex:Name>
+                </netex:DayType>
+                <netex:DayTypeAssignment id="dta1" version="any" order="0">
+                    <netex:OperatingPeriodRef ref="CITYWAY:OperatingPeriod:1:LOC" version="any"/>
+                    <netex:DayTypeRef ref="CITYWAY:DayType:1:LOC" version="any"/>
+                </netex:DayTypeAssignment>
+                <netex:DayTypeAssignment id="dta2" version="any" order="0">
+                    <netex:OperatingPeriodRef ref="CITYWAY:OperatingPeriod:1:LOC" version="any"/>
+                    <netex:DayTypeRef ref="CITYWAY:DayType:2:LOC" version="any"/>
+                </netex:DayTypeAssignment>
+                <netex:DayTypeAssignment id="dta3" version="any" order="0">
+                    <netex:Date>2017-03-15</netex:Date>
+                    <netex:DayTypeRef ref="CITYWAY:DayType:3:LOC" version="any"/>
+                    <netex:isAvailable>true</netex:isAvailable>
+                </netex:DayTypeAssignment>
+                <netex:DayTypeAssignment id="dta4" version="any" order="0">
+                    <netex:Date>2017-03-15</netex:Date>
+                    <netex:DayTypeRef ref="CITYWAY:DayType:4:LOC" version="any"/>
+                    <netex:isAvailable>false</netex:isAvailable>
+                </netex:DayTypeAssignment>
+                <netex:OperatingPeriod id="CITYWAY:OperatingPeriod:1:LOC" version="any">
+                    <netex:FromDate>2017-01-01T00:00:00</netex:FromDate>
+                    <netex:ToDate>2017-12-31T00:00:00</netex:ToDate>
+                </netex:OperatingPeriod>
+
+            </netex:members>
+        </netex:GeneralFrame>
+    </netex:dataObjects>
+</netex:PublicationDelivery>
diff --git a/spec/fixtures/target_OFFRE_TRANSDEV_20170301122517.zip b/spec/fixtures/target_OFFRE_TRANSDEV_20170301122517.zip
deleted file mode 100644
index 08164df0b..000000000
Binary files a/spec/fixtures/target_OFFRE_TRANSDEV_20170301122517.zip and /dev/null differ
diff --git a/spec/fixtures/target_OFFRE_TRANSDEV_20170301122519.zip b/spec/fixtures/target_OFFRE_TRANSDEV_20170301122519.zip
deleted file mode 100644
index 69d323e02..000000000
Binary files a/spec/fixtures/target_OFFRE_TRANSDEV_20170301122519.zip and /dev/null differ
-- 
cgit v1.2.3