Repository: nephila/djangocms-installer
Pull request #279 (2016-08-27 10:15:04)

Switch to core plugins. Enable RC/develop support

coveralls: 
[![Coverage Status](https://coveralls.io/builds/7635853/badge)](https://coveralls.io/builds/7635853)

Coverage decreased (-0.6%) to 93.801% when pulling **ea3c57fb5d8899ab6e5907a9a0ff2bcecf8ba93e on feature/core_plugins** into **c7b65587f653c4e4cda53ca0acb8ad3495a49b93 on develop**.

codecov-io: ## [Current coverage](https://codecov.io/gh/nephila/djangocms-installer/pull/279?src=pr) is 88.25% (diff: 80.95%)
> Merging [#279](https://codecov.io/gh/nephila/djangocms-installer/pull/279?src=pr) into [develop](https://codecov.io/gh/nephila/djangocms-installer/branch/develop?src=pr) will decrease coverage by **0.80%**

```diff
@@            develop       #279   diff @@
==========================================
  Files             8          8          
  Lines           603        613    +10   
  Methods           0          0          
  Messages          0          0          
  Branches        125        129     +4   
==========================================
+ Hits            537        541     +4   
- Misses           34         38     +4   
- Partials         32         34     +2   
```

> Powered by [Codecov](https://codecov.io?src=pr). Last update [c7b6558...ea3c57f](https://codecov.io/gh/nephila/djangocms-installer/compare/c7b65587f653c4e4cda53ca0acb8ad3495a49b93...ea3c57fb5d8899ab6e5907a9a0ff2bcecf8ba93e?src=pr)
coveralls: 
[![Coverage Status](https://coveralls.io/builds/7635931/badge)](https://coveralls.io/builds/7635931)

Coverage decreased (-2.9%) to 91.461% when pulling **feacb1ad6633b77a646ce6c610b87e99dcee7abb on feature/core_plugins** into **c7b65587f653c4e4cda53ca0acb8ad3495a49b93 on develop**.

coveralls: 
[![Coverage Status](https://coveralls.io/builds/7635937/badge)](https://coveralls.io/builds/7635937)

Coverage decreased (-0.3%) to 94.089% when pulling **feacb1ad6633b77a646ce6c610b87e99dcee7abb on feature/core_plugins** into **c7b65587f653c4e4cda53ca0acb8ad3495a49b93 on develop**.


Patch:
diff --git a/HISTORY.rst b/HISTORY.rst
index be77da7..0d4931b 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -11,7 +11,10 @@ History
 * Drop support for django CMS < 3.2
 * Improve inline documentation
 * If -s option is used, original directory is not removed
-* Set django CMS 3.3 as stabl
+* Set django CMS 3.3 as stable
+* Add support for 'rc' releases
+* Only "core" plugins are now supported
+* Drop support for django-reversion in django CMS 3.4 (due to upstream drop)
 
 0.8.11 (2016-07-15)
 +++++++++++++++++++
diff --git a/README.rst b/README.rst
index e72e610..e8ee537 100644
--- a/README.rst
+++ b/README.rst
@@ -43,7 +43,7 @@ project.
 Refer to `django CMS Tutorial`_
 on how to properly setup your first django CMS project.
 
-.. warning:: Version 0.9 will drop support for Python 2.6, Django <1.8 and django CMS < 3.2.
+.. warning:: Version 0.9 dropped support for Python 2.6, Django <1.8 and django CMS < 3.2.
              More 0.8.x versions may be released after 0.9 is out in case important bugfixes will
              be needed.
 
@@ -76,14 +76,16 @@ Supported versions
 The current supported version matrix is the following:
 
 +----------------+-------------+-------------+---------------+
-|                | Django 1.8  | Django 1.9  | Django master |
+|                | Django 1.8  | Django 1.9  | Django 1.10   |
 +----------------+-------------+-------------+---------------+
 | django CMS 3.2 | Supported   | Supported   | Unsupported   |
 +----------------+-------------+-------------+---------------+
-| django CMS dev | Supported   | Supported   | Unsupported   |
+| django CMS 3.3 | Supported   | Supported   | Unsupported   |
++----------------+-------------+-------------+---------------+
+| django CMS 3.4 | Supported   | Supported   | WiP           |
 +----------------+-------------+-------------+---------------+
 
-Check `version 0.8`_ for older Django / django CMS versions support
+See `version 0.8`_ for older Django / django CMS versions support
 
 Any beta and develop version of Django and django CMS, by its very nature,
 it's not supported, while it still may work.
diff --git a/djangocms_installer/config/__init__.py b/djangocms_installer/config/__init__.py
index 8af297a..79ef8f6 100644
--- a/djangocms_installer/config/__init__.py
+++ b/djangocms_installer/config/__init__.py
@@ -61,7 +61,8 @@ information.
                         action='store', help='Optional default time zone. Example: Europe/Rome')
     parser.add_argument('--reversion', '-e', dest='reversion', action='store',
                         choices=('yes', 'no'),
-                        default='yes', help='Install and configure reversion support')
+                        default='yes', help='Install and configure reversion support '
+                                            '(only for django CMS 3.2 and 3.3)')
     parser.add_argument('--permissions', dest='permissions', action='store',
                         choices=('yes', 'no'),
                         default='yes', help='Activate CMS permission management')
@@ -111,7 +112,8 @@ information.
                         default=False,
                         help='Be more verbose and don\'t swallow subcommands output')
     parser.add_argument('--filer', '-f', dest='filer', action='store_true',
-                        default=False, help='Install and configure django-filer plugins')
+                        default=True, help='Install and configure django-filer plugins '
+                                           '- Always enabled')
     parser.add_argument('--requirements', '-r', dest='requirements_file', action='store',
                         default=None, help='Externally defined requirements file')
     parser.add_argument('--no-deps', '-n', dest='no_deps', action='store_true',
@@ -200,6 +202,7 @@ information.
     if len(args.languages) > 1:
         args.i18n = 'yes'
     args.aldryn = False
+    args.filer = True
 
     # Convert version to numeric format for easier checking
     try:
@@ -236,7 +239,11 @@ information.
         else:
             requirements.append('django-cms<{0}'.format(less_than_version(cms_version)))
 
-        if cms_version >= 3.3:
+        if args.cms_version in ('rc', 'develop'):
+            requirements.extend(data.REQUIREMENTS['cms-master'])
+        # elif cms_version >= 3.4:
+        #    requirements.extend(data.REQUIREMENTS['cms-3.4'])
+        elif cms_version >= 3.3:
             requirements.extend(data.REQUIREMENTS['cms-3.3'])
         elif cms_version >= 3.2:
             requirements.extend(data.REQUIREMENTS['cms-3.2'])
@@ -245,12 +252,20 @@ information.
             requirements.append(args.db_driver)
         if not args.no_plugins:
             if args.filer:
-                requirements.extend(data.REQUIREMENTS['plugins-common'])
-                requirements.extend(data.REQUIREMENTS['filer'])
-            else:
-                requirements.extend(data.REQUIREMENTS['plugins-common'])
-                requirements.extend(data.REQUIREMENTS['plugins-basic'])
-            if cms_version >= 3.3 or cms_version == 'rc':
+                if args.cms_version in ('rc', 'develop'):
+                    requirements.extend(data.REQUIREMENTS['plugins-common-master'])
+                    requirements.extend(data.REQUIREMENTS['filer'])
+                else:
+                    requirements.extend(data.REQUIREMENTS['plugins-common'])
+                    requirements.extend(data.REQUIREMENTS['filer'])
+            # else:
+            #    requirements.extend(data.REQUIREMENTS['plugins-common'])
+            #    requirements.extend(data.REQUIREMENTS['plugins-basic'])
+            if args.cms_version in ('rc', 'develop'):
+                requirements.extend(data.REQUIREMENTS['ckeditor-master'])
+            # elif cms_version >= 3.4:
+            #    requirements.extend(data.REQUIREMENTS['ckeditor-3.4'])
+            elif cms_version >= 3.3:
                 requirements.extend(data.REQUIREMENTS['ckeditor-3.3'])
             else:
                 requirements.extend(data.REQUIREMENTS['ckeditor-3.2'])
@@ -273,7 +288,7 @@ information.
             requirements.append('pytz')
 
         # Reversion package version depends on django version
-        if args.reversion:
+        if args.reversion and cms_version in (3.2, 3.3):
             if django_version == 1.8:
                 requirements.extend(data.REQUIREMENTS['reversion-django-1.8'])
             elif django_version == 1.9:
diff --git a/djangocms_installer/config/data.py b/djangocms_installer/config/data.py
index 29d1dd7..e9ab7a5 100644
--- a/djangocms_installer/config/data.py
+++ b/djangocms_installer/config/data.py
@@ -16,10 +16,10 @@ DJANGOCMS_RC = 'https://github.com/divio/django-cms/archive/develop.zip?{bust}'.
 DJANGOCMS_BETA = 'https://github.com/divio/django-cms/archive/3.0.0.beta3.zip'
 
 if sys.version_info >= (3, 5):
-    DJANGOCMS_SUPPORTED = ('3.2', '3.3', 'stable', 'develop')
+    DJANGOCMS_SUPPORTED = ('3.2', '3.3', 'stable', 'rc', 'develop')
     DJANGOCMS_STABLE = 3.3
 else:
-    DJANGOCMS_SUPPORTED = ('3.2', '3.3', 'stable', 'develop')
+    DJANGOCMS_SUPPORTED = ('3.2', '3.3', 'stable', 'rc', 'develop')
     DJANGOCMS_STABLE = 3.3
 
 DJANGO_DEVELOP = 'https://github.com/django/django/archive/master.zip?{bust}'.format(**bust)
@@ -39,9 +39,9 @@ else:
 
 CMS_VERSION_MATRIX = {
     'stable': DJANGOCMS_STABLE,
-    'rc': 3.3,
-    'beta': 3.3,
-    'develop': 3.3
+    'rc': 3.4,
+    'beta': 3.4,
+    'develop': 3.4
 }
 DJANGO_VERSION_MATRIX = {
     'stable': DJANGO_STABLE,
@@ -52,6 +52,7 @@ DJANGO_VERSION_MATRIX = {
 VERSION_MATRIX = {
     3.2: (1.8, 1.9),
     3.3: (1.8, 1.9),
+    3.4: (1.8, 1.9),
 }
 
 REQUIREMENTS = {
@@ -80,24 +81,52 @@ REQUIREMENTS = {
         'djangocms-admin-style>=1.2,<1.3',
         'django-treebeard>=4.0,<5.0',
     ],
+    'cms-3.4': [
+        'djangocms-admin-style>=1.2,<1.3',
+        'django-treebeard>=4.0,<5.0',
+    ],
+    'cms-master': [
+        'https://github.com/divio/djangocms-admin-style/archive/master.zip?{bust}'.format(**bust),
+        'django-treebeard>=4.0,<5.0',
+    ],
     'ckeditor-3.2': [
         'djangocms-text-ckeditor>=2.8.1,<=2.9.3',
     ],
     'ckeditor-3.3': [
-        'djangocms-text-ckeditor>=3.0,<3.1',
+        'djangocms-text-ckeditor>=3.0,<3.2',
+    ],
+    'ckeditor-3.4': [
+        'djangocms-text-ckeditor>=3.2',
+    ],
+    'ckeditor-master': [
+        'https://github.com/divio/djangocms-text-ckeditor/archive/master.zip?{bust}'
+        ''.format(**bust),
     ],
     'plugins-common': [
-        'djangocms-column>=1.6,<1.7',
-        'djangocms-googlemap>=0.5,<1.6',
-        'djangocms-inherit>=0.2.1,<1.03',
-        'djangocms-style>=1.7,<1.8',
         'djangocms-link>=1.8,<1.9',
+        'djangocms-style>=1.7,<1.8',
+        'djangocms-googlemap>=0.4,<0.6',
+        'djangocms-snippet>=1.8,<2',
+        'djangocms-video>=1.1,<2.0',
+        'djangocms-column>=1.6',
     ],
     'plugins-basic': [
         'djangocms-file>=1.0,<1.1',
         'djangocms-picture>=0.2.0,<0.3',
         'djangocms-teaser>=0.2.0,<0.3',
-        'djangocms-video>=1.0,<1.1',
+    ],
+    'plugins-common-master': [
+        'https://github.com/divio/djangocms-link/archive/master.zip?{bust}'.format(**bust),
+        'https://github.com/divio/djangocms-style/archive/master.zip?{bust}'.format(**bust),
+        'https://github.com/divio/djangocms-googlemap/archive/master.zip?{bust}'.format(**bust),
+        'https://github.com/divio/djangocms-snippet/archive/master.zip?{bust}'.format(**bust),
+        'https://github.com/divio/djangocms-video/archive/master.zip?{bust}'.format(**bust),
+        'https://github.com/divio/djangocms-column/archive/master.zip?{bust}'.format(**bust),
+    ],
+    'plugins-basic-master': [
+        'https://github.com/divio/djangocms-file/archive/master.zip?{bust}'.format(**bust),
+        'https://github.com/divio/djangocms-picture/archive/master.zip?{bust}'.format(**bust),
+        'https://github.com/divio/djangocms-teaser/archive/master.zip?{bust}'.format(**bust),
     ],
     'filer': [
         'easy_thumbnails',
@@ -124,26 +153,16 @@ TEMPLATES = [
 """
 
 PLUGIN_LIST_TEXT = """
-djangocms_installer will install and configure the following plugins:
- * djangocms_column (Column plugin)
- * djangocms-file (File plugin)
- * djangocms-googlemap (GoogleMap plugin)
- * djangocms-inherit (Inherit plugin)
- * djangocms-link (Link plugin)
- * djangocms-picture (Picture plugin)
- * djangocms_style (Style plugin)
- * djangocms-teaser (Teaser plugin)
+djangocms installer will install and configure the following plugins:
  * djangocms-text-ckeditor (Text plugin)
- * djangocms-video (Video plugin)
-
-It will optionally install cmsplugin-filer plugins (if requested during
-configuration):
+ * djangocms-link (Link plugin)
  * cmsplugin_filer_file (File plugin, replaces djangocms-file)
  * cmsplugin_filer_folder (Folder plugin)
  * cmsplugin_filer_image (Image plugin, replaces djangocms-picture)
- * djangocms-link (Link plugin)
- * cmsplugin_filer_teaser (Teaser plugin, replaces djangocms-teaser)
- * cmsplugin_filer_video (Video plugin, replaces djangocms-video)
+ * djangocms-style (Style plugin)
+ * djangocms-snippet (Snippet plugin)
+ * djangocms-googlemap (GoogleMap plugin)
+ * djangocms-video (Video plugin)
 """
 
 DRIVERS = {
diff --git a/djangocms_installer/config/settings.py b/djangocms_installer/config/settings.py
index 6f63e90..25c0631 100644
--- a/djangocms_installer/config/settings.py
+++ b/djangocms_installer/config/settings.py
@@ -21,10 +21,6 @@ MIDDLEWARE_CLASSES = [
     'cms.middleware.language.LanguageCookieMiddleware',
 ]
 
-MIDDLEWARE_CLASSES_DJANGO_15 = [
-    'django.middleware.transaction.TransactionMiddleware',
-]
-
 
 TEMPLATE_CONTEXT_PROCESSORS = [
     'django.contrib.auth.context_processors.auth',
@@ -38,9 +34,7 @@ TEMPLATE_CONTEXT_PROCESSORS = [
     'sekizai.context_processors.sekizai',
     'django.core.context_processors.static',
 ]
-TEMPLATE_CONTEXT_PROCESSORS_2 = [
-    'cms.context_processors.media',
-]
+
 TEMPLATE_CONTEXT_PROCESSORS_3 = [
     'cms.context_processors.cms_settings',
 ]
@@ -70,18 +64,6 @@ TREEBEARD_APPS = (
     'treebeard',
 )
 
-STANDARD_PLUGINS_2 = (
-    'cms.plugins.file',
-    'cms.plugins.flash',
-    'cms.plugins.googlemap',
-    'cms.plugins.inherit',
-    'cms.plugins.link',
-    'cms.plugins.picture',
-    'cms.plugins.teaser',
-    'cms.plugins.text',
-    'cms.plugins.twitter',
-    'cms.plugins.video',
-)
 STANDARD_PLUGINS_3 = (
     'djangocms_file',
     'djangocms_googlemap',
@@ -92,33 +74,19 @@ STANDARD_PLUGINS_3 = (
     'djangocms_video',
 )
 
-FILER_PLUGINS_2 = (
-    'filer',
-    'easy_thumbnails',
-    'cmsplugin_filer_image',
-    'cmsplugin_filer_file',
-    'cmsplugin_filer_folder',
-    'cmsplugin_filer_teaser',
-    'cmsplugin_filer_utils',
-    'cmsplugin_filer_video',
-    'cms.plugins.flash',
-    'cms.plugins.googlemap',
-    'cms.plugins.inherit',
-    'djangocms_link',
-)
-
 FILER_PLUGINS_3 = (
     'filer',
     'easy_thumbnails',
-    'cmsplugin_filer_image',
+    'djangocms_column',
+    'djangocms_link',
     'cmsplugin_filer_file',
     'cmsplugin_filer_folder',
-    'cmsplugin_filer_teaser',
+    'cmsplugin_filer_image',
     'cmsplugin_filer_utils',
-    'cmsplugin_filer_video',
+    'djangocms_style',
+    'djangocms_snippet',
     'djangocms_googlemap',
-    'djangocms_inherit',
-    'djangocms_link',
+    'djangocms_video',
 )
 
 CMS_3_HEAD = (
@@ -127,12 +95,6 @@ CMS_3_HEAD = (
 
 CMS_3_APPLICATIONS = (
     'djangocms_text_ckeditor',
-    'djangocms_style',
-    'djangocms_column',
-)
-
-CMS_2_APPLICATIONS = (
-    'cms.plugins.text',
 )
 
 REVERSION_APPLICATIONS = (
@@ -207,6 +169,7 @@ MIGRATIONS_CHECK_MODULES = (
     'djangocms_style',
     'djangocms_file',
     'djangocms_picture',
+    'djangocms_snippet',
     'djangocms_teaser',
     'djangocms_video',
 )
diff --git a/djangocms_installer/django/__init__.py b/djangocms_installer/django/__init__.py
index 6eb8264..bd9aa0f 100644
--- a/djangocms_installer/django/__init__.py
+++ b/djangocms_installer/django/__init__.py
@@ -259,14 +259,11 @@ def _build_settings(config_data):
     apps.extend(vars.CMS_3_APPLICATIONS)
 
     if not config_data.no_plugins:
-        if config_data.filer:
-            apps.extend(vars.FILER_PLUGINS_3)
-        else:
-            apps.extend(vars.STANDARD_PLUGINS_3)
+        apps.extend(vars.FILER_PLUGINS_3)
 
     if config_data.aldryn:  # pragma: no cover
         apps.extend(vars.ALDRYN_APPLICATIONS)
-    if config_data.reversion:
+    if config_data.reversion and config_data.cms_version < 3.4:
         apps.extend(vars.REVERSION_APPLICATIONS)
     text.append('INSTALLED_APPS = (\n{0}{1}\n)'.format(
         spacer, (',\n' + spacer).join(['\'{0}\''.format(var) for var in apps] +
diff --git a/docs/reference.rst b/docs/reference.rst
index 06fd5f7..22c8c34 100644
--- a/docs/reference.rst
+++ b/docs/reference.rst
@@ -29,14 +29,15 @@ The following arguments can be overridden in :ref:`wizard_mode`
 * ``--use-tz``, ``-z``: Activate Django timezone support;  choices: ``yes|no``, default: ``yes``
 * ``--timezone``, ``-t``: Optional default time zone, default: *local timezone*
 * ``--reversion``, ``-e``: Install and configure reversion support, choices: ``yes|no``,
-  default: ``yes``
+  default: ``yes``; this will ignored for RC/develop/3.4 versions of django CMS as support has
+  been dropped upstream;
 * ``--permissions``: Activate CMS permission management; choices: ``yes|no``, default: ``yes``
 * ``--languages``, ``-l``: Languages available for the project. Option can be provided multiple
   times, or as a comma separated list.
   Only language codes supported by Django can be used here;
   refer to `django source`_ for a list of supported codes.
-* ``--django-version``: Django version;  choices: ``1.4|1.5|1.6|1.7|stable``, default: ``stable``
-* ``--cms-version``, ``-v``: django CMS version, choices: ``2.4|3.0|3.1|stable|develop``.
+* ``--django-version``: Django version;  choices: ``1.8|1.9|stable``, default: ``stable``
+* ``--cms-version``, ``-v``: django CMS version, choices: ``3.2|3.3|stable|rc|develop``.
   default: ``stable``
 * ``--bootstrap``: Use Twitter Bootstrap as theme, choices: ``yes|no``, default: ``no``
 * ``--starting-page``: Load a starting page with examples (available for english language only)
@@ -44,8 +45,8 @@ The following arguments can be overridden in :ref:`wizard_mode`
 * ``--templates``: Use a custom directory as template source; is checked to be a valid path,
   otherwise the shipped templates are used
 
-.. note:: ``stable`` keyword is expanded to Django version 1.7
-.. note:: ``stable`` keyword is expanded to django CMS version 3.1
+.. note:: ``stable`` keyword is expanded to Django version 1.8
+.. note:: ``stable`` keyword is expanded to django CMS version 3.3
 .. warning:: if an unsupported combination of Django and django CMS version is selected, the
              wizard exits reporting the error.
 
@@ -58,7 +59,8 @@ advanced usage:
 * ``--no-input``, ``-q``: If given **djangocms installer** run in :ref:`batch_mode`;
 * ``--verbose``, : Provides output of the commands used to setup the project, namely ``pip`` and
   ``django-admin``;
-* ``--filer``, ``-f``: Install and configure django-filer plugins;
+* ``--filer``, ``-f``: Install and configure django-filer plugins; since 0.9 this is enabled by default
+  and can't be disabled;
 * ``--config-file``: Provides the configuration options via a ini file; see :ref:`ini_mode`;
 * ``--config-dump``: Dumps the configuration in a format suitable for ``-config-file``
   option; see :ref:`ini_mode`;


Test patch:
diff --git a/tests/config.py b/tests/config.py
index b3c275e..4f09aa3 100644
--- a/tests/config.py
+++ b/tests/config.py
@@ -296,9 +296,9 @@ class TestConfig(BaseTestClass):
     def test_supported_versions(self):
         self.assertEqual(supported_versions('stable', 'stable'), (1.8, 3.3))
         self.assertEqual(supported_versions('stable', '3.1.10'), (1.8, None))
-        self.assertEqual(supported_versions('stable', 'rc'), (1.8, 3.3))
-        self.assertEqual(supported_versions('stable', 'beta'), (1.8, 3.3))
-        self.assertEqual(supported_versions('stable', 'develop'), (1.8, 3.3))
+        self.assertEqual(supported_versions('stable', 'rc'), (1.8, 3.4))
+        self.assertEqual(supported_versions('stable', 'beta'), (1.8, 3.4))
+        self.assertEqual(supported_versions('stable', 'develop'), (1.8, 3.4))
 
         with self.assertRaises(RuntimeError):
             supported_versions('stable', '2.4'), (1.5, 2.4)
@@ -351,14 +351,14 @@ class TestConfig(BaseTestClass):
         self.assertTrue(conf_data.requirements.find('djangocms-text-ckeditor>=3.0') > -1)
         self.assertTrue(conf_data.requirements.find('djangocms-admin-style>=1.2') > -1)
         self.assertTrue(conf_data.requirements.find('djangocms-column') > -1)
-        self.assertTrue(conf_data.requirements.find('djangocms-file') > -1)
+        self.assertTrue(conf_data.requirements.find('djangocms-file') == -1)
         self.assertTrue(conf_data.requirements.find('djangocms-flash') == -1)
         self.assertTrue(conf_data.requirements.find('djangocms-googlemap') > -1)
-        self.assertTrue(conf_data.requirements.find('djangocms-inherit') > -1)
+        self.assertTrue(conf_data.requirements.find('djangocms-inherit') == -1)
         self.assertTrue(conf_data.requirements.find('djangocms-link') > -1)
-        self.assertTrue(conf_data.requirements.find('djangocms-picture') > -1)
+        self.assertTrue(conf_data.requirements.find('djangocms-picture') == -1)
         self.assertTrue(conf_data.requirements.find('djangocms-style') > -1)
-        self.assertTrue(conf_data.requirements.find('djangocms-teaser') > -1)
+        self.assertTrue(conf_data.requirements.find('djangocms-teaser') == -1)
         self.assertTrue(conf_data.requirements.find('djangocms-video') > -1)
 
         conf_data = config.parse([
@@ -374,7 +374,7 @@ class TestConfig(BaseTestClass):
 
         self.assertTrue(conf_data.requirements.find(config.data.DJANGOCMS_DEVELOP) > -1)
         self.assertTrue(conf_data.requirements.find('Django<1.9') > -1)
-        self.assertTrue(conf_data.requirements.find('django-reversion>=1.10,<1.11') > -1)
+        self.assertFalse(conf_data.requirements.find('django-reversion') > -1)
         self.assertTrue(conf_data.requirements.find('djangocms-text-ckeditor') > -1)
         self.assertTrue(conf_data.requirements.find('djangocms-admin-style') > -1)
         self.assertTrue(conf_data.requirements.find('django-filer') > -1)
@@ -383,12 +383,12 @@ class TestConfig(BaseTestClass):
         self.assertTrue(conf_data.requirements.find('djangocms-file') == -1)
         self.assertTrue(conf_data.requirements.find('djangocms-flash') == -1)
         self.assertTrue(conf_data.requirements.find('djangocms-googlemap') > -1)
-        self.assertTrue(conf_data.requirements.find('djangocms-inherit') > -1)
-        #self.assertTrue(conf_data.requirements.find('djangocms-link') > -1)
+        self.assertTrue(conf_data.requirements.find('djangocms-inherit') == -1)
+        self.assertTrue(conf_data.requirements.find('djangocms-link') > -1)
         self.assertTrue(conf_data.requirements.find('djangocms-picture') == -1)
         self.assertTrue(conf_data.requirements.find('djangocms-style') > -1)
         self.assertTrue(conf_data.requirements.find('djangocms-teaser') == -1)
-        self.assertTrue(conf_data.requirements.find('djangocms-video') == -1)
+        self.assertTrue(conf_data.requirements.find('djangocms-video') > -1)
 
         dj_version = '1.8'
         conf_data = config.parse([
@@ -404,7 +404,7 @@ class TestConfig(BaseTestClass):
 
         self.assertTrue(conf_data.requirements.find(config.data.DJANGOCMS_DEVELOP) > -1)
         self.assertTrue(conf_data.requirements.find('Django<1.9') > -1)
-        self.assertTrue(conf_data.requirements.find('django-reversion>=1.10,<1.11') > -1)
+        self.assertFalse(conf_data.requirements.find('django-reversion') > -1)
         self.assertTrue(conf_data.requirements.find('django-mptt') == -1)
         self.assertTrue(conf_data.requirements.find('django-treebeard') > -1)
 
@@ -412,7 +412,7 @@ class TestConfig(BaseTestClass):
             '-q',
             '--db=postgres://user:pwd@host/dbname',
             '--i18n=no',
-            '--cms-version=develop',
+            '--cms-version=rc',
             '--django-version=stable',
             '-f',
             '--reversion=yes',
@@ -422,9 +422,16 @@ class TestConfig(BaseTestClass):
 
         self.assertTrue(conf_data.requirements.find(config.data.DJANGOCMS_DEVELOP) > -1)
         self.assertTrue(conf_data.requirements.find('Django<1.9') > -1)
-        self.assertTrue(conf_data.requirements.find('django-reversion>=1.10,<1.11') > -1)
-        self.assertTrue(conf_data.requirements.find('djangocms-text-ckeditor') > -1)
-        self.assertTrue(conf_data.requirements.find('djangocms-admin-style') > -1)
+        self.assertFalse(conf_data.requirements.find('django-reversion') > -1)
+        self.assertTrue(conf_data.requirements.find('https://github.com/divio/djangocms-link') > -1)
+        self.assertTrue(conf_data.requirements.find('https://github.com/divio/djangocms-style') > -1)
+        self.assertTrue(conf_data.requirements.find('https://github.com/divio/djangocms-googlemap') > -1)
+        self.assertTrue(conf_data.requirements.find('https://github.com/divio/djangocms-snippet') > -1)
+        self.assertTrue(conf_data.requirements.find('https://github.com/divio/djangocms-video') > -1)
+        self.assertTrue(conf_data.requirements.find('https://github.com/divio/djangocms-column') > -1)
+        self.assertTrue(conf_data.requirements.find('https://github.com/divio/djangocms-admin-style') > -1)
+        self.assertTrue(conf_data.requirements.find('https://github.com/divio/djangocms-text-ckeditor') > -1)
+
         self.assertTrue(conf_data.requirements.find('pytz') > -1)
 
         conf_data = config.parse([
@@ -460,10 +467,10 @@ class TestConfig(BaseTestClass):
 
         self.assertTrue(conf_data.requirements.find(config.data.DJANGOCMS_DEVELOP) > -1)
         self.assertTrue(conf_data.requirements.find('Django<1.9') > -1)
-        self.assertTrue(conf_data.requirements.find('django-reversion>=1.10,<1.11') > -1)
-        self.assertTrue(conf_data.requirements.find('djangocms-text-ckeditor>=3.0') > -1)
-        self.assertTrue(conf_data.requirements.find('djangocms-admin-style>=1.2') > -1)
-        self.assertTrue(conf_data.requirements.find('djangocms-teaser') > -1)
+        self.assertFalse(conf_data.requirements.find('django-reversion>=1.10,<1.11') > -1)
+        self.assertTrue(conf_data.requirements.find('djangocms-text-ckeditor') > -1)
+        self.assertTrue(conf_data.requirements.find('djangocms-admin-style') > -1)
+        self.assertTrue(conf_data.requirements.find('djangocms-teaser') == -1)
         self.assertTrue(conf_data.requirements.find('south') == -1)
 
         dj_version = '1.8'
@@ -481,10 +488,10 @@ class TestConfig(BaseTestClass):
 
         self.assertTrue(conf_data.requirements.find(config.data.DJANGOCMS_DEVELOP) > -1)
         self.assertTrue(conf_data.requirements.find('Django<1.9') > -1)
-        self.assertTrue(conf_data.requirements.find('django-reversion>=1.10,<1.11') > -1)
-        self.assertTrue(conf_data.requirements.find('djangocms-text-ckeditor/archive/master.zip') == -1)
-        self.assertTrue(conf_data.requirements.find('djangocms-admin-style/archive/master.zip') == -1)
-        self.assertTrue(conf_data.requirements.find('djangocms-teaser/archive/master.zip') == -1)
+        self.assertFalse(conf_data.requirements.find('django-reversion') > -1)
+        self.assertTrue(conf_data.requirements.find('djangocms-text-ckeditor') == -1)
+        self.assertTrue(conf_data.requirements.find('djangocms-admin-style/archive/master') > -1)
+        self.assertTrue(conf_data.requirements.find('djangocms-teaser') == -1)
         self.assertTrue(conf_data.requirements.find('south') == -1)
 
         dj_version = '1.8'
@@ -502,9 +509,9 @@ class TestConfig(BaseTestClass):
 
         self.assertTrue(conf_data.requirements.find(config.data.DJANGOCMS_DEVELOP) > -1)
         self.assertTrue(conf_data.requirements.find('Django<1.9') > -1)
-        self.assertTrue(conf_data.requirements.find('django-reversion>=1.10,<1.11') > -1)
-        self.assertTrue(conf_data.requirements.find('djangocms-text-ckeditor>=3.0') == -1)
-        self.assertTrue(conf_data.requirements.find('djangocms-admin-style/archive/master.zip') == -1)
+        self.assertFalse(conf_data.requirements.find('django-reversion') > -1)
+        self.assertTrue(conf_data.requirements.find('djangocms-text-ckeditor') == -1)
+        self.assertTrue(conf_data.requirements.find('djangocms-admin-style/archive/master.zip') > -1)
         self.assertTrue(conf_data.requirements.find('djangocms-teaser/archive/master.zip') == -1)
         self.assertTrue(conf_data.requirements.find('south') == -1)
 
@@ -688,7 +695,7 @@ class TestBaseConfig(unittest.TestCase):
         'django_version': DJANGO_VERSION_MATRIX['stable'],
         'dump_reqs': False,
         'extra_settings': None,
-        'filer': False,
+        'filer': True,
         'i18n': 'yes',
         'languages': ['en'],
         'no_db_driver': False,
diff --git a/tests/django.py b/tests/django.py
index 25f05b2..6786516 100644
--- a/tests/django.py
+++ b/tests/django.py
@@ -120,7 +120,7 @@ class TestDjango(IsolatedTestClass):
 
     @unittest.skipIf(sys.version_info[:2] not in ((2, 7), (3, 4), (3, 5),),
                      reason='django 1.9 only supports python 2.7, 3.4 and 3.5')
-    def test_patch_19_settings(self):
+    def test_patch_19_32_settings(self):
         extra_path = os.path.join(os.path.dirname(__file__), 'data', 'extra_settings.py')
         config_data = config.parse(['--db=sqlite://localhost/test.db',
                                     '--lang=en', '--extra-settings=%s' % extra_path,
@@ -149,7 +149,7 @@ class TestDjango(IsolatedTestClass):
 
     @unittest.skipIf(sys.version_info[:2] not in ((2, 7), (3, 4), (3, 5),),
                      reason='django 1.9 only supports python 2.7, 3.4 and 3.5')
-    def test_patch_django_19(self):
+    def test_patch_django_19_32(self):
         config_data = config.parse(['--db=sqlite://localhost/test.db',
                                     '--lang=en', '--bootstrap=yes',
                                     '--django-version=1.9',
@@ -175,25 +175,25 @@ class TestDjango(IsolatedTestClass):
         self.assertEqual(project.settings.MEDIA_URL, '/media/')
 
         self.assertEqual(project.settings.TIME_ZONE, 'Europe/Moscow')
-        self.assertTrue('cmsplugin_filer_image' not in project.settings.INSTALLED_APPS)
-        self.assertTrue('cmsplugin_filer_file' not in project.settings.INSTALLED_APPS)
-        self.assertTrue('cmsplugin_filer_folder' not in project.settings.INSTALLED_APPS)
+        self.assertTrue('cmsplugin_filer_image' in project.settings.INSTALLED_APPS)
+        self.assertTrue('cmsplugin_filer_file' in project.settings.INSTALLED_APPS)
+        self.assertTrue('cmsplugin_filer_folder' in project.settings.INSTALLED_APPS)
         self.assertTrue('cmsplugin_filer_link' not in project.settings.INSTALLED_APPS)
         self.assertTrue('cmsplugin_filer_teaser' not in project.settings.INSTALLED_APPS)
-        self.assertTrue('cmsplugin_filer_utils' not in project.settings.INSTALLED_APPS)
+        self.assertTrue('cmsplugin_filer_utils' in project.settings.INSTALLED_APPS)
         self.assertTrue('cmsplugin_filer_video' not in project.settings.INSTALLED_APPS)
         self.assertTrue('djangocms_text_ckeditor' in project.settings.INSTALLED_APPS)
         self.assertTrue('djangocms_admin_style' in project.settings.INSTALLED_APPS)
-        self.assertTrue('filer' not in project.settings.INSTALLED_APPS)
+        self.assertTrue('filer' in project.settings.INSTALLED_APPS)
         self.assertTrue('djangocms_column' in project.settings.INSTALLED_APPS)
-        self.assertTrue('djangocms_file' in project.settings.INSTALLED_APPS)
+        self.assertTrue('djangocms_file' not in project.settings.INSTALLED_APPS)
         self.assertTrue('djangocms_flash' not in project.settings.INSTALLED_APPS)
         self.assertTrue('djangocms_googlemap' in project.settings.INSTALLED_APPS)
-        self.assertTrue('djangocms_inherit' in project.settings.INSTALLED_APPS)
+        self.assertTrue('djangocms_inherit' not in project.settings.INSTALLED_APPS)
         self.assertTrue('djangocms_link' in project.settings.INSTALLED_APPS)
-        self.assertTrue('djangocms_picture' in project.settings.INSTALLED_APPS)
+        self.assertTrue('djangocms_picture' not in project.settings.INSTALLED_APPS)
         self.assertTrue('djangocms_style' in project.settings.INSTALLED_APPS)
-        self.assertTrue('djangocms_teaser' in project.settings.INSTALLED_APPS)
+        self.assertTrue('djangocms_teaser' not in project.settings.INSTALLED_APPS)
         self.assertTrue('djangocms_video' in project.settings.INSTALLED_APPS)
         self.assertTrue(
             config.get_settings().APPHOOK_RELOAD_MIDDLEWARE_CLASS_OLD not in
@@ -213,7 +213,7 @@ class TestDjango(IsolatedTestClass):
 
     @unittest.skipIf(sys.version_info[:2] not in ((2, 7), (3, 3), (3, 4), (3, 5),),
                      reason='django 1.8 only supports python 2.7, 3.3, 3.4 and 3.5')
-    def test_patch_django_17_settings(self):
+    def test_patch_django_18_32(self):
         extra_path = os.path.join(os.path.dirname(__file__), 'data', 'extra_settings.py')
         config_data = config.parse(['--db=sqlite://localhost/test.db',
                                     '--lang=en', '--extra-settings=%s' % extra_path,
@@ -237,7 +237,7 @@ class TestDjango(IsolatedTestClass):
 
     @unittest.skipIf(sys.version_info[:2] not in ((2, 7), (3, 3), (3, 4), (3, 5),),
                      reason='django 1.8 only supports python 2.7, 3.3, 3.4 and 3.5')
-    def test_patch_django_18_32(self):
+    def test_patch_django_18_develop(self):
         # On django CMS 3.2 the reload apphooks middleware is enabled by default
         extra_path = os.path.join(os.path.dirname(__file__), 'data', 'extra_settings.py')
         config_data = config.parse(['--db=sqlite://localhost/test.db',
@@ -269,7 +269,7 @@ class TestDjango(IsolatedTestClass):
 
     @unittest.skipIf(sys.version_info[:2] not in ((2, 7), (3, 4), (3, 5),),
                      reason='django 1.9 only supports python 2.7, 3.4 and 3.5')
-    def test_patch_django_19_32(self):
+    def test_patch_django_19_develop(self):
         # On django CMS 3.2 the reload apphooks middleware is enabled by default
         extra_path = os.path.join(os.path.dirname(__file__), 'data', 'extra_settings.py')
         config_data = config.parse(['--db=sqlite://localhost/test.db',
@@ -392,22 +392,22 @@ class TestDjango(IsolatedTestClass):
         self.assertTrue('cmsplugin_filer_file' in project.settings.INSTALLED_APPS)
         self.assertTrue('cmsplugin_filer_folder' in project.settings.INSTALLED_APPS)
         self.assertTrue('cmsplugin_filer_link' not in project.settings.INSTALLED_APPS)
-        self.assertTrue('cmsplugin_filer_teaser' in project.settings.INSTALLED_APPS)
+        self.assertTrue('cmsplugin_filer_teaser' not in project.settings.INSTALLED_APPS)
         self.assertTrue('cmsplugin_filer_utils' in project.settings.INSTALLED_APPS)
-        self.assertTrue('cmsplugin_filer_video' in project.settings.INSTALLED_APPS)
+        self.assertTrue('cmsplugin_filer_video' not in project.settings.INSTALLED_APPS)
         self.assertTrue('djangocms_text_ckeditor' in project.settings.INSTALLED_APPS)
         self.assertTrue('djangocms_admin_style' in project.settings.INSTALLED_APPS)
         self.assertTrue('filer' in project.settings.INSTALLED_APPS)
-        self.assertTrue('djangocms_column' in project.settings.INSTALLED_APPS)
         self.assertTrue('djangocms_file' not in project.settings.INSTALLED_APPS)
         self.assertTrue('djangocms_flash' not in project.settings.INSTALLED_APPS)
         self.assertTrue('djangocms_googlemap' in project.settings.INSTALLED_APPS)
-        self.assertTrue('djangocms_inherit' in project.settings.INSTALLED_APPS)
+        self.assertTrue('djangocms_inherit' not in project.settings.INSTALLED_APPS)
         self.assertTrue('djangocms_link' in project.settings.INSTALLED_APPS)
         self.assertTrue('djangocms_picture' not in project.settings.INSTALLED_APPS)
         self.assertTrue('djangocms_style' in project.settings.INSTALLED_APPS)
         self.assertTrue('djangocms_teaser' not in project.settings.INSTALLED_APPS)
-        self.assertTrue('djangocms_video' not in project.settings.INSTALLED_APPS)
+        self.assertTrue('djangocms_video' in project.settings.INSTALLED_APPS)
+        self.assertTrue('djangocms_column' in project.settings.INSTALLED_APPS)
         self.assertTrue(hasattr(project.settings, 'THUMBNAIL_PROCESSORS'))
         self.assertTrue(
             'cms.context_processors.cms_settings' in
diff --git a/tests/fixtures/configs/config-01.ini b/tests/fixtures/configs/config-01.ini
index e7869c2..d38aa45 100644
--- a/tests/fixtures/configs/config-01.ini
+++ b/tests/fixtures/configs/config-01.ini
@@ -15,7 +15,7 @@ starting-page = no
 list-plugins = false
 dump-requirements = false
 no-input = false
-filer = false
+filer = true
 requirements =
 no-deps = false
 no-db-driver = false
diff --git a/tests/fixtures/configs/config-02.ini b/tests/fixtures/configs/config-02.ini
index e77e9d8..b18f511 100644
--- a/tests/fixtures/configs/config-02.ini
+++ b/tests/fixtures/configs/config-02.ini
@@ -15,7 +15,7 @@ starting-page = no
 list-plugins = false
 dump-requirements = false
 no-input = false
-filer = false
+filer = true
 requirements =
 no-deps = false
 no-db-driver = false
diff --git a/tests/fixtures/configs/config-03.ini b/tests/fixtures/configs/config-03.ini
index 2fd526f..646f3df 100644
--- a/tests/fixtures/configs/config-03.ini
+++ b/tests/fixtures/configs/config-03.ini
@@ -15,7 +15,7 @@ starting-page = no
 list-plugins = false
 dump-requirements = false
 no-input = false
-filer = false
+filer = true
 requirements =
 no-deps = false
 no-db-driver = false
diff --git a/tests/fixtures/configs/config-04.ini b/tests/fixtures/configs/config-04.ini
index 9ff0426..5542d51 100644
--- a/tests/fixtures/configs/config-04.ini
+++ b/tests/fixtures/configs/config-04.ini
@@ -15,7 +15,7 @@ starting-page = no
 list-plugins = false
 dump-requirements = false
 no-input = false
-filer = false
+filer = true
 requirements =
 no-deps = false
 no-db-driver = false
diff --git a/tests/fixtures/configs/config-05.ini b/tests/fixtures/configs/config-05.ini
index fabbf0c..5c9348f 100644
--- a/tests/fixtures/configs/config-05.ini
+++ b/tests/fixtures/configs/config-05.ini
@@ -15,7 +15,7 @@ starting-page = no
 list-plugins = false
 dump-requirements = false
 no-input = false
-filer = false
+filer = true
 requirements =
 no-deps = false
 no-db-driver = false
diff --git a/tests/fixtures/configs/config-06.ini b/tests/fixtures/configs/config-06.ini
index 5ab8a98..0e47369 100644
--- a/tests/fixtures/configs/config-06.ini
+++ b/tests/fixtures/configs/config-06.ini
@@ -15,7 +15,7 @@ starting-page = no
 list-plugins = false
 dump-requirements = false
 no-input = false
-filer = false
+filer = true
 requirements =
 no-deps = false
 no-db-driver = false
diff --git a/tests/fixtures/configs/config-08.ini b/tests/fixtures/configs/config-08.ini
index 4f1d820..4ea0450 100644
--- a/tests/fixtures/configs/config-08.ini
+++ b/tests/fixtures/configs/config-08.ini
@@ -15,7 +15,7 @@ starting-page = no
 list-plugins = false
 dump-requirements = false
 no-input = false
-filer = false
+filer = true
 requirements =
 no-deps = false
 no-db-driver = false
diff --git a/tests/fixtures/configs/config-09.ini b/tests/fixtures/configs/config-09.ini
index 00dfdbe..412425a 100644
--- a/tests/fixtures/configs/config-09.ini
+++ b/tests/fixtures/configs/config-09.ini
@@ -15,7 +15,7 @@ starting-page = no
 list-plugins = false
 dump-requirements = false
 no-input = false
-filer = false
+filer = true
 requirements =
 no-deps = false
 no-db-driver = false
diff --git a/tests/fixtures/configs/config-10.ini b/tests/fixtures/configs/config-10.ini
index 300619d..754e701 100644
--- a/tests/fixtures/configs/config-10.ini
+++ b/tests/fixtures/configs/config-10.ini
@@ -15,7 +15,7 @@ starting-page = no
 list-plugins = false
 dump-requirements = false
 no-input = false
-filer = false
+filer = true
 requirements =
 no-deps = false
 no-db-driver = false
diff --git a/tests/fixtures/configs/config-10b.ini b/tests/fixtures/configs/config-10b.ini
index 82b3592..1b27808 100644
--- a/tests/fixtures/configs/config-10b.ini
+++ b/tests/fixtures/configs/config-10b.ini
@@ -15,7 +15,7 @@ starting-page = no
 list-plugins = false
 dump-requirements = false
 no-input = false
-filer = false
+filer = true
 requirements =
 no-deps = false
 no-db-driver = false
diff --git a/tests/fixtures/configs/config-11.ini b/tests/fixtures/configs/config-11.ini
index 4b0b77d..4363bf6 100644
--- a/tests/fixtures/configs/config-11.ini
+++ b/tests/fixtures/configs/config-11.ini
@@ -15,7 +15,7 @@ starting-page = no
 list-plugins = false
 dump-requirements = false
 no-input = false
-filer = false
+filer = true
 requirements =
 no-deps = false
 no-db-driver = false
diff --git a/tests/fixtures/configs/config-12.ini b/tests/fixtures/configs/config-12.ini
index 858b1cb..9089ded 100644
--- a/tests/fixtures/configs/config-12.ini
+++ b/tests/fixtures/configs/config-12.ini
@@ -15,7 +15,7 @@ starting-page = no
 list-plugins = false
 dump-requirements = false
 no-input = false
-filer = false
+filer = true
 requirements =
 no-deps = false
 no-db-driver = false
diff --git a/tests/fixtures/configs/config-13.ini b/tests/fixtures/configs/config-13.ini
index 01a1001..dd3769b 100644
--- a/tests/fixtures/configs/config-13.ini
+++ b/tests/fixtures/configs/config-13.ini
@@ -15,7 +15,7 @@ starting-page = no
 list-plugins = false
 dump-requirements = false
 no-input = false
-filer = false
+filer = true
 requirements =
 no-deps = false
 no-db-driver = false
diff --git a/tests/fixtures/configs/config-14.ini b/tests/fixtures/configs/config-14.ini
index 4a72ab4..7bbc8d9 100644
--- a/tests/fixtures/configs/config-14.ini
+++ b/tests/fixtures/configs/config-14.ini
@@ -15,7 +15,7 @@ starting-page = yes
 list-plugins = false
 dump-requirements = false
 no-input = false
-filer = false
+filer = true
 requirements =
 no-deps = false
 no-db-driver = false
diff --git a/tests/fixtures/configs/config-15.ini b/tests/fixtures/configs/config-15.ini
index f13b271..f358802 100644
--- a/tests/fixtures/configs/config-15.ini
+++ b/tests/fixtures/configs/config-15.ini
@@ -15,7 +15,7 @@ starting-page = yes
 list-plugins = true
 dump-requirements = false
 no-input = false
-filer = false
+filer = true
 requirements =
 no-deps = false
 no-db-driver = false
diff --git a/tests/fixtures/configs/config-16.ini b/tests/fixtures/configs/config-16.ini
index 1410323..dcb2bd7 100644
--- a/tests/fixtures/configs/config-16.ini
+++ b/tests/fixtures/configs/config-16.ini
@@ -15,7 +15,7 @@ starting-page = yes
 list-plugins = true
 dump-requirements = true
 no-input = false
-filer = false
+filer = true
 requirements =
 no-deps = false
 no-db-driver = false
diff --git a/tests/fixtures/configs/config-17.ini b/tests/fixtures/configs/config-17.ini
index 080c806..307f84f 100644
--- a/tests/fixtures/configs/config-17.ini
+++ b/tests/fixtures/configs/config-17.ini
@@ -15,7 +15,7 @@ starting-page = yes
 list-plugins = true
 dump-requirements = true
 no-input = true
-filer = false
+filer = true
 requirements =
 no-deps = false
 no-db-driver = false
diff --git a/tests/main.py b/tests/main.py
index e2e7f68..8442fa1 100644
--- a/tests/main.py
+++ b/tests/main.py
@@ -28,14 +28,16 @@ class TestMain(IsolatedTestClass):
         self.assertTrue(stdout.find('djangocms-text-ckeditor') > -1)
         self.assertTrue(stdout.find('djangocms-admin-style') > -1)
         self.assertTrue(stdout.find('djangocms-column') > -1)
-        self.assertTrue(stdout.find('djangocms-file') > -1)
+        self.assertTrue(stdout.find('djangocms-file') == -1)
         self.assertTrue(stdout.find('djangocms-flash') == -1)
         self.assertTrue(stdout.find('djangocms-googlemap') > -1)
-        self.assertTrue(stdout.find('djangocms-inherit') > -1)
+        self.assertTrue(stdout.find('djangocms-inherit') == -1)
         self.assertTrue(stdout.find('djangocms-link') > -1)
-        self.assertTrue(stdout.find('djangocms-picture') > -1)
+        self.assertTrue(stdout.find('djangocms-picture') == -1)
         self.assertTrue(stdout.find('djangocms-style') > -1)
-        self.assertTrue(stdout.find('djangocms-teaser') > -1)
+        self.assertTrue(stdout.find('djangocms-snippet') > -1)
+        self.assertTrue(stdout.find('cmsplugin-filer') > -1)
+        self.assertTrue(stdout.find('djangocms-teaser') == -1)
         self.assertTrue(stdout.find('djangocms-video') > -1)
 
     def cleanup_ask(self):