Make OFP run against FP tests on top of its own

tangentlabs · Aug 29, 2013 · c21c413 · c21c413
1 parent fced935
commit c21c413
Show file tree

Hide file tree

Showing 19 changed files with 17 additions and 496 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,6 +16,6 @@ install:
   - pip install . --use-mirrors
   - pip install -r requirements.txt --use-mirrors
 script:
-  - py.test tests --pep8 --cov fancypages
+  - py.test --pep8 --cov --pyargs fancypages -m 'not fp_only'
 after_success:
   - coveralls
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-.PHONY: docs
+.PHONY: docs tests install sandbox
 
 install:
 	pip install -e . > /dev/null
@@ -12,3 +12,6 @@ sandbox: install
 
 docs:
 	$(MAKE) -C docs html
+
+tests:
+	py.test --pyargs fancypages -m 'not fp_only'
diff --git a/conftest.py b/conftest.py
@@ -12,14 +12,15 @@
 
 
 location = lambda x: os.path.join(os.path.dirname(os.path.realpath(__file__)), x)
-sandbox = lambda x: location("sandbox/%s" % x)
+sandbox = lambda x: location("oscar_sandbox/%s" % x)
 
 
 def pytest_configure():
     SETTINGS = OSCAR_SETTINGS
     SETTINGS.update(FANCYPAGES_SETTINGS)
 
     settings.configure(
+        DEBUG=True,
         DATABASES={
             'default': {
                 'ENGINE': 'django.db.backends.sqlite3',
@@ -59,7 +60,7 @@ def pytest_configure():
             'django.contrib.messages.middleware.MessageMiddleware',
             'fancypages.middleware.EditorMiddleware',
         ),
-        ROOT_URLCONF='sandbox.sandbox.urls',
+        ROOT_URLCONF='oscar_sandbox.sandbox.urls',
         TEMPLATE_DIRS=[
             sandbox('templates'),
             OSCAR_MAIN_TEMPLATE_DIR,
@@ -78,7 +79,8 @@ def pytest_configure():
             'twitter_tag',
             'sorl.thumbnail',
             'rest_framework',
-        ] + ofp_utils.get_oscar_fancypages_apps() + get_core_apps([]),
+            'django_extensions',
+        ] + ofp_utils.get_oscar_fancypages_apps() + get_core_apps(),
         AUTHENTICATION_BACKENDS=(
             'django.contrib.auth.backends.ModelBackend',
         ),
@@ -89,5 +91,6 @@ def pytest_configure():
         },
         LOGIN_REDIRECT_URL='/accounts/',
         APPEND_SLASH=True,
+        SITE_ID=1,
         **SETTINGS
     )
diff --git a/sandbox/__init__.py → oscar_sandbox/__init__.py b/sandbox/__init__.py → oscar_sandbox/__init__.py
diff --git a/sandbox/fixtures/auth.json → oscar_sandbox/fixtures/auth.json b/sandbox/fixtures/auth.json → oscar_sandbox/fixtures/auth.json
diff --git a/sandbox/manage.py → oscar_sandbox/manage.py b/sandbox/manage.py → oscar_sandbox/manage.py
diff --git a/sandbox/sandbox/__init__.py → oscar_sandbox/sandbox/__init__.py b/sandbox/sandbox/__init__.py → oscar_sandbox/sandbox/__init__.py
diff --git a/sandbox/sandbox/settings.py → oscar_sandbox/sandbox/settings.py b/sandbox/sandbox/settings.py → oscar_sandbox/sandbox/settings.py
@@ -112,7 +112,7 @@
     'fancypages.middleware.EditorMiddleware',
 )
 
-ROOT_URLCONF = 'sandbox.urls'
+ROOT_URLCONF = 'sandbox.ofp_urls'
 
 # Python dotted path to the WSGI application used by Django's runserver.
 WSGI_APPLICATION = 'sandbox.wsgi.application'

diff --git a/sandbox/sandbox/settings_mysql.py → oscar_sandbox/sandbox/settings_mysql.py b/sandbox/sandbox/settings_mysql.py → oscar_sandbox/sandbox/settings_mysql.py
diff --git a/sandbox/sandbox/settings_postgres.py → oscar_sandbox/sandbox/settings_postgres.py b/sandbox/sandbox/settings_postgres.py → oscar_sandbox/sandbox/settings_postgres.py
diff --git a/sandbox/sandbox/urls.py → oscar_sandbox/sandbox/urls.py b/sandbox/sandbox/urls.py → oscar_sandbox/sandbox/urls.py
@@ -13,6 +13,7 @@
 
     url(r'^admin/', include(admin.site.urls)),
     url(r'', include(shop.urls)),
+
     url(r'', include('oscar_fancypages.urls')),
 )
 

diff --git a/sandbox/sandbox/wsgi.py → oscar_sandbox/sandbox/wsgi.py b/sandbox/sandbox/wsgi.py → oscar_sandbox/sandbox/wsgi.py
diff --git a/...lates/basket/partials/basket_content.html → ...lates/basket/partials/basket_content.html b/...lates/basket/partials/basket_content.html → ...lates/basket/partials/basket_content.html
diff --git a/sandbox/templates/catalogue/detail.html → ...r_sandbox/templates/catalogue/detail.html b/sandbox/templates/catalogue/detail.html → ...r_sandbox/templates/catalogue/detail.html
diff --git a/...ates/promotions/automaticproductlist.html → ...ates/promotions/automaticproductlist.html b/...ates/promotions/automaticproductlist.html → ...ates/promotions/automaticproductlist.html
diff --git a/...tes/promotions/handpickedproductlist.html → ...tes/promotions/handpickedproductlist.html b/...tes/promotions/handpickedproductlist.html → ...tes/promotions/handpickedproductlist.html
diff --git a/requirements.txt b/requirements.txt
@@ -29,6 +29,10 @@ pytest-django==2.3.0
 pytest-pep8==1.0.4
 pytest-sugar==0.2.1
 
+# Browser testing
+splinter==0.5.4
+virtual-node==0.0.4
+
 # documentation
 Sphinx>=1.1.3
 docutils>=0.8.1