diff --git a/cms/test_utils/project/placeholderapp/migrations/0001_initial.py b/cms/test_utils/project/placeholderapp/migrations/0001_initial.py index 166016b4bf4..08ac34d1a02 100644 --- a/cms/test_utils/project/placeholderapp/migrations/0001_initial.py +++ b/cms/test_utils/project/placeholderapp/migrations/0001_initial.py @@ -130,12 +130,12 @@ def backwards(self, orm): 'publish': ('django.db.models.fields.BooleanField', [], {'default': 'True'}) }, 'placeholderapp.multilingualexample1': { - 'Meta': {'unique_together': '()', 'object_name': 'MultilingualExample1', 'index_together': '()'}, + 'Meta': {'unique_together': '()', 'object_name': 'MultilingualExample1'}, 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'placeholder_1': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['cms.Placeholder']", 'null': 'True'}) }, 'placeholderapp.multilingualexample1translation': { - 'Meta': {'unique_together': "[('language_code', 'master')]", 'object_name': 'MultilingualExample1Translation', 'db_table': "'placeholderapp_multilingualexample1_translation'", 'index_together': '()'}, + 'Meta': {'unique_together': "[('language_code', 'master')]", 'object_name': 'MultilingualExample1Translation', 'db_table': "'placeholderapp_multilingualexample1_translation'"}, 'char_1': ('django.db.models.fields.CharField', [], {'max_length': '255'}), 'char_2': ('django.db.models.fields.CharField', [], {'max_length': '255'}), 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), diff --git a/cms/tests/frontend.py b/cms/tests/frontend.py index 10cb95f6e78..c982113853f 100644 --- a/cms/tests/frontend.py +++ b/cms/tests/frontend.py @@ -473,7 +473,7 @@ def test_cms_modal_html5_validation_error(self): create_page('apphook', 'simple.html', 'fr', published=True, apphook=Example1App) url = '%s/%s/?%s' % ( - self.live_server_url, '/apphook/detail/class/%s' + self.live_server_url, 'apphook/detail/class/%s' % ex1.pk, get_cms_setting('CMS_TOOLBAR_URL__EDIT_ON') ) self.driver.get(url)