Merge pull request #11 from akeneo/1.3_fixtures

Upgraded fixtures to 1.3 version of Akeneo PIM CE
akeneo-labs · Feb 26, 2015 · 8127c63 · 8127c63
2 parents d6ca12d + c5c8a24
commit 8127c63
Show file tree

Hide file tree

Showing 11 changed files with 50 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## 1.4.0
+ - Made compatible with PIM CE 1.3.x
+ - Updated the init file from fixtures:
+    - Removed default_value and usable_as_grid_column from attributes and family tab
+    - Corrected the codes for wysywig_enabled and available_locales in the attributes and family tab
+    - Removed the is_default column from the options tab
+    - Removed garbage characters
+
 ## 1.3.2
  - Added compatibility with PIM CE 1.2.6
 

diff --git a/Resources/fixtures/minimal/init.xlsx b/Resources/fixtures/minimal/init.xlsx
diff --git a/Resources/fixtures/minimal/locales.yml b/Resources/fixtures/minimal/locales.yml
@@ -1,10 +1,7 @@
 locales:
     en_US:
-        fallback: ~
         currency: USD
     fr_FR:
-        fallback: en_US
         currency: EUR
     de_DE:
-        fallback: en_US
         currency: EUR
diff --git a/Resources/fixtures/minimal/user_groups.yml b/Resources/fixtures/minimal/user_groups.yml
@@ -0,0 +1,9 @@
+user_groups:
+    it_support:
+        name: IT support
+    manager:
+        name: Manager
+    redactor:
+        name: Redactor
+    all:
+        name: All
diff --git a/Resources/fixtures/minimal/user_roles.yml b/Resources/fixtures/minimal/user_roles.yml
@@ -0,0 +1,7 @@
+user_roles:
+    ROLE_ADMINISTRATOR:
+        label: Administrator
+    ROLE_CATALOG_MANAGER:
+        label: Catalog manager
+    ROLE_USER:
+        label: User
diff --git a/Resources/fixtures/minimal/users.yml b/Resources/fixtures/minimal/users.yml
@@ -2,12 +2,15 @@ users:
     admin:
         username: admin
         password: admin
-        email: [email protected]
+        email: '[email protected]'
         firstname: Peter
         lastname: Doe
         owner: Main
         catalog_locale: en_US
         catalog_scope: ecommerce
         default_tree: master
-        role: ROLE_ADMINISTRATOR
+        roles:
+            - ROLE_ADMINISTRATOR
+        groups:
+            - IT support
         enable: true
diff --git a/Resources/fixtures/minimal_FR/init.xlsx b/Resources/fixtures/minimal_FR/init.xlsx
diff --git a/Resources/fixtures/minimal_FR/locales.yml b/Resources/fixtures/minimal_FR/locales.yml
@@ -1,10 +1,7 @@
 locales:
     en_US:
-        fallback: ~
         currency: USD
     fr_FR:
-        fallback: en_US
         currency: EUR
     de_DE:
-        fallback: en_US
         currency: EUR
diff --git a/Resources/fixtures/minimal_FR/user_groups.yml b/Resources/fixtures/minimal_FR/user_groups.yml
@@ -0,0 +1,9 @@
+user_groups:
+    it_support:
+        name: IT support
+    manager:
+        name: Manager
+    redactor:
+        name: Redactor
+    all:
+        name: All
diff --git a/Resources/fixtures/minimal_FR/user_roles.yml b/Resources/fixtures/minimal_FR/user_roles.yml
@@ -0,0 +1,7 @@
+user_roles:
+    ROLE_ADMINISTRATOR:
+        label: Administrator
+    ROLE_CATALOG_MANAGER:
+        label: Catalog manager
+    ROLE_USER:
+        label: User
diff --git a/Resources/fixtures/minimal_FR/users.yml b/Resources/fixtures/minimal_FR/users.yml
@@ -2,12 +2,15 @@ users:
     admin:
         username: admin
         password: admin
-        email: [email protected]
+        email: '[email protected]'
         firstname: Peter
         lastname: Doe
         owner: Main
         catalog_locale: en_US
         catalog_scope: ecommerce
         default_tree: master
-        role: ROLE_ADMINISTRATOR
+        roles:
+            - ROLE_ADMINISTRATOR
+        groups:
+            - IT support
         enable: true