diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..7bc4acb --- /dev/null +++ b/.travis.yml @@ -0,0 +1,16 @@ +language: python +python: "2.7" +branches: + only: + - noreg_order +notifications: + irc: "irc.freenode.org#starzel" +install: + - mkdir -p buildout-cache/eggs + - mkdir -p buildout-cache/downloads + - python bootstrap.py -c travis.cfg + - bin/buildout -N -t 3 -c travis.cfg +before_script: + - "export DISPLAY=:99.0" + - "sh -e /etc/init.d/xvfb start" +script: bin/test diff --git a/README.rst b/README.rst index 5c13a36..76976c7 100644 --- a/README.rst +++ b/README.rst @@ -3,6 +3,9 @@ Introduction PCommerce (Plone commerce) provides a simple shop system which supports: +.. image:: https://api.travis-ci.org/Gomez/pcommerce.core.png + :target: https://travis-ci.org/Gomez/pcommerce.core + * product variations * multiple prices per product to support special prices per user or group (over the sharing tab) and prices only available for a specific time diff --git a/bootstrap.py b/bootstrap.py new file mode 100644 index 0000000..5f2cb08 --- /dev/null +++ b/bootstrap.py @@ -0,0 +1,260 @@ +############################################################################## +# +# Copyright (c) 2006 Zope Foundation and Contributors. +# All Rights Reserved. +# +# This software is subject to the provisions of the Zope Public License, +# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution. +# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED +# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS +# FOR A PARTICULAR PURPOSE. +# +############################################################################## +"""Bootstrap a buildout-based project + +Simply run this script in a directory containing a buildout.cfg. +The script accepts buildout command-line options, so you can +use the -c option to specify an alternate configuration file. +""" + +import os, shutil, sys, tempfile, textwrap, urllib, urllib2, subprocess +from optparse import OptionParser + +if sys.platform == 'win32': + def quote(c): + if ' ' in c: + return '"%s"' % c # work around spawn lamosity on windows + else: + return c +else: + quote = str + +# See zc.buildout.easy_install._has_broken_dash_S for motivation and comments. +stdout, stderr = subprocess.Popen( + [sys.executable, '-Sc', + 'try:\n' + ' import ConfigParser\n' + 'except ImportError:\n' + ' print 1\n' + 'else:\n' + ' print 0\n'], + stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate() +has_broken_dash_S = bool(int(stdout.strip())) + +# In order to be more robust in the face of system Pythons, we want to +# run without site-packages loaded. This is somewhat tricky, in +# particular because Python 2.6's distutils imports site, so starting +# with the -S flag is not sufficient. However, we'll start with that: +if not has_broken_dash_S and 'site' in sys.modules: + # We will restart with python -S. + args = sys.argv[:] + args[0:0] = [sys.executable, '-S'] + args = map(quote, args) + os.execv(sys.executable, args) +# Now we are running with -S. We'll get the clean sys.path, import site +# because distutils will do it later, and then reset the path and clean +# out any namespace packages from site-packages that might have been +# loaded by .pth files. +clean_path = sys.path[:] +import site +sys.path[:] = clean_path +for k, v in sys.modules.items(): + if k in ('setuptools', 'pkg_resources') or ( + hasattr(v, '__path__') and + len(v.__path__)==1 and + not os.path.exists(os.path.join(v.__path__[0],'__init__.py'))): + # This is a namespace package. Remove it. + sys.modules.pop(k) + +is_jython = sys.platform.startswith('java') + +setuptools_source = 'http://peak.telecommunity.com/dist/ez_setup.py' +distribute_source = 'http://python-distribute.org/distribute_setup.py' + +# parsing arguments +def normalize_to_url(option, opt_str, value, parser): + if value: + if '://' not in value: # It doesn't smell like a URL. + value = 'file://%s' % ( + urllib.pathname2url( + os.path.abspath(os.path.expanduser(value))),) + if opt_str == '--download-base' and not value.endswith('/'): + # Download base needs a trailing slash to make the world happy. + value += '/' + else: + value = None + name = opt_str[2:].replace('-', '_') + setattr(parser.values, name, value) + +usage = '''\ +[DESIRED PYTHON FOR BUILDOUT] bootstrap.py [options] + +Bootstraps a buildout-based project. + +Simply run this script in a directory containing a buildout.cfg, using the +Python that you want bin/buildout to use. + +Note that by using --setup-source and --download-base to point to +local resources, you can keep this script from going over the network. +''' + +parser = OptionParser(usage=usage) +parser.add_option("-v", "--version", dest="version", + help="use a specific zc.buildout version") +parser.add_option("-d", "--distribute", + action="store_true", dest="use_distribute", default=False, + help="Use Distribute rather than Setuptools.") +parser.add_option("--setup-source", action="callback", dest="setup_source", + callback=normalize_to_url, nargs=1, type="string", + help=("Specify a URL or file location for the setup file. " + "If you use Setuptools, this will default to " + + setuptools_source + "; if you use Distribute, this " + "will default to " + distribute_source +".")) +parser.add_option("--download-base", action="callback", dest="download_base", + callback=normalize_to_url, nargs=1, type="string", + help=("Specify a URL or directory for downloading " + "zc.buildout and either Setuptools or Distribute. " + "Defaults to PyPI.")) +parser.add_option("--eggs", + help=("Specify a directory for storing eggs. Defaults to " + "a temporary directory that is deleted when the " + "bootstrap script completes.")) +parser.add_option("-t", "--accept-buildout-test-releases", + dest='accept_buildout_test_releases', + action="store_true", default=False, + help=("Normally, if you do not specify a --version, the " + "bootstrap script and buildout gets the newest " + "*final* versions of zc.buildout and its recipes and " + "extensions for you. If you use this flag, " + "bootstrap and buildout will get the newest releases " + "even if they are alphas or betas.")) +parser.add_option("-c", None, action="store", dest="config_file", + help=("Specify the path to the buildout configuration " + "file to be used.")) + +options, args = parser.parse_args() + +# if -c was provided, we push it back into args for buildout's main function +if options.config_file is not None: + args += ['-c', options.config_file] + +if options.eggs: + eggs_dir = os.path.abspath(os.path.expanduser(options.eggs)) +else: + eggs_dir = tempfile.mkdtemp() + +if options.setup_source is None: + if options.use_distribute: + options.setup_source = distribute_source + else: + options.setup_source = setuptools_source + +if options.accept_buildout_test_releases: + args.append('buildout:accept-buildout-test-releases=true') +args.append('bootstrap') + +try: + import pkg_resources + import setuptools # A flag. Sometimes pkg_resources is installed alone. + if not hasattr(pkg_resources, '_distribute'): + raise ImportError +except ImportError: + ez_code = urllib2.urlopen( + options.setup_source).read().replace('\r\n', '\n') + ez = {} + exec ez_code in ez + setup_args = dict(to_dir=eggs_dir, download_delay=0) + if options.download_base: + setup_args['download_base'] = options.download_base + if options.use_distribute: + setup_args['no_fake'] = True + ez['use_setuptools'](**setup_args) + if 'pkg_resources' in sys.modules: + reload(sys.modules['pkg_resources']) + import pkg_resources + # This does not (always?) update the default working set. We will + # do it. + for path in sys.path: + if path not in pkg_resources.working_set.entries: + pkg_resources.working_set.add_entry(path) + +cmd = [quote(sys.executable), + '-c', + quote('from setuptools.command.easy_install import main; main()'), + '-mqNxd', + quote(eggs_dir)] + +if not has_broken_dash_S: + cmd.insert(1, '-S') + +find_links = options.download_base +if not find_links: + find_links = os.environ.get('bootstrap-testing-find-links') +if find_links: + cmd.extend(['-f', quote(find_links)]) + +if options.use_distribute: + setup_requirement = 'distribute' +else: + setup_requirement = 'setuptools' +ws = pkg_resources.working_set +setup_requirement_path = ws.find( + pkg_resources.Requirement.parse(setup_requirement)).location +env = dict( + os.environ, + PYTHONPATH=setup_requirement_path) + +requirement = 'zc.buildout' +version = options.version +if version is None and not options.accept_buildout_test_releases: + # Figure out the most recent final version of zc.buildout. + import setuptools.package_index + _final_parts = '*final-', '*final' + def _final_version(parsed_version): + for part in parsed_version: + if (part[:1] == '*') and (part not in _final_parts): + return False + return True + index = setuptools.package_index.PackageIndex( + search_path=[setup_requirement_path]) + if find_links: + index.add_find_links((find_links,)) + req = pkg_resources.Requirement.parse(requirement) + if index.obtain(req) is not None: + best = [] + bestv = None + for dist in index[req.project_name]: + distv = dist.parsed_version + if _final_version(distv): + if bestv is None or distv > bestv: + best = [dist] + bestv = distv + elif distv == bestv: + best.append(dist) + if best: + best.sort() + version = best[-1].version +if version: + requirement = '=='.join((requirement, version)) +cmd.append(requirement) + +if is_jython: + import subprocess + exitcode = subprocess.Popen(cmd, env=env).wait() +else: # Windows prefers this, apparently; otherwise we would prefer subprocess + exitcode = os.spawnle(*([os.P_WAIT, sys.executable] + cmd + [env])) +if exitcode != 0: + sys.stdout.flush() + sys.stderr.flush() + print ("An error occurred when trying to install zc.buildout. " + "Look above this message for any errors that " + "were output by easy_install.") + sys.exit(exitcode) + +ws.add_entry(eggs_dir) +ws.require(requirement) +import zc.buildout.buildout +zc.buildout.buildout.main(args) +if not options.eggs: # clean up temporary egg directory + shutil.rmtree(eggs_dir) diff --git a/buildout.cfg b/buildout.cfg new file mode 100644 index 0000000..9473dfc --- /dev/null +++ b/buildout.cfg @@ -0,0 +1,56 @@ +[buildout] +parts = + lxml + instance + test + +extends = http://dist.plone.org/release/4.2.1/versions.cfg + +versions = versions +develop = . + +extensions = mr.developer + +sources = sources +auto-checkout = * +sources-dir = src +eggs = +zcml = + +[instance] +recipe = plone.recipe.zope2instance +user = admin:admin +http-address = 8088 +eggs = + ${buildout:eggs} + collective.MockMailHost + Plone + Pillow + plone.act + pcommerce.core + pcommerce.shipment.parcel + pcommerce.payment.invoice +environment-vars = + zope_i18n_compile_mo_files true + +zcml = + ${buildout:zcml} + +[lxml] +recipe = z3c.recipe.staticlxml +egg = lxml + +[test] +recipe = zc.recipe.testrunner +eggs = pcommerce.core [test] +defaults = ['--auto-color', '--auto-progress'] + +[sources] +plone.act = git git://github.com/plone/plone.act.git +#Bad release 0.6 on PyPi - delete if its fixed +collective.MockMailHost = git https://github.com/collective/collective.mockmailhost.git + +[versions] +pcommerce.payment.invoice = 1.0b5 +pcommerce.shipment.parcel = 1.0b2 +lxml = 2.2.4 diff --git a/docs/TODO.txt b/docs/TODO.txt index fd473af..8eec2e4 100644 --- a/docs/TODO.txt +++ b/docs/TODO.txt @@ -8,15 +8,15 @@ Customers Membership integration ~~~~~~~~~~~~~~~~~~~~~~ -Integrate order form with site membership, or don't require membership? +[x] Integrate order form with site membership, or don't require membership? Switch in control panel -The payment process should be easier for customers, now lots of duplicate +[] The payment process should be easier for customers, now lots of duplicate data have to be filled in. Product filtering ~~~~~~~~~~~~~~~~~ -Filter on product properties to narrow down products (ajax?) +[] Filter on product properties to narrow down products (ajax?) Vendor @@ -25,11 +25,11 @@ Vendor Order management ~~~~~~~~~~~~~~~~ -* batching (implemented in 1.0b12) +[x] batching (implemented in 1.0b12) -* filtering (on status, for example) +[] filtering (on status, for example) -* Integrate processing here? The current way is rather flimsy: vendor clicks a +[] Integrate processing here? The current way is rather flimsy: vendor clicks a link from an email which takes him to the processOrder page, which redirects to a blank page displaying only "order processed". @@ -40,6 +40,6 @@ Order management General ------- -* Layout: currently has own CSS looking like Plone 3. Try styling by adding +[] Layout: currently has own CSS looking like Plone 3. Try styling by adding only classes, so we use Plone's own styling (should work in both 3 and 4). -* Translations: replace bare strings with labels and defaults +[] Translations: replace bare strings with labels and defaults diff --git a/setup.py b/setup.py index caeeed2..041f05b 100644 --- a/setup.py +++ b/setup.py @@ -20,7 +20,8 @@ author_email='dev@raptus.com', url='https://github.com/Raptus/pcommerce.core', license='GPL', - packages=find_packages(exclude=['ez_setup']), + packages=find_packages('src'), + package_dir={'': 'src'}, namespace_packages=['pcommerce'], include_package_data=True, zip_safe=False, @@ -29,6 +30,18 @@ 'Products.SingleKeywordWidget', # -*- Extra requirements: -*- ], + extras_require = { + 'test': [ + 'plone.app.testing', + 'collective.MockMailHost', + 'plone.act', + 'Products.SingleKeywordWidget', + 'pcommerce.shipment.parcel', + 'pcommerce.payment.invoice', + 'robotsuite', + 'robotframework-selenium2library', + ] + }, entry_points=""" # -*- Entry points: -*- [z3c.autoinclude.plugin] diff --git a/pcommerce/__init__.py b/src/pcommerce/__init__.py similarity index 100% rename from pcommerce/__init__.py rename to src/pcommerce/__init__.py diff --git a/pcommerce/core/__init__.py b/src/pcommerce/core/__init__.py similarity index 100% rename from pcommerce/core/__init__.py rename to src/pcommerce/core/__init__.py diff --git a/pcommerce/core/adapters.py b/src/pcommerce/core/adapters.py similarity index 100% rename from pcommerce/core/adapters.py rename to src/pcommerce/core/adapters.py diff --git a/pcommerce/core/address.py b/src/pcommerce/core/address.py similarity index 100% rename from pcommerce/core/address.py rename to src/pcommerce/core/address.py diff --git a/src/pcommerce/core/browser/.configlet.pt.swp b/src/pcommerce/core/browser/.configlet.pt.swp new file mode 100644 index 0000000..a53e0a0 Binary files /dev/null and b/src/pcommerce/core/browser/.configlet.pt.swp differ diff --git a/pcommerce/core/browser/__init__.py b/src/pcommerce/core/browser/__init__.py similarity index 100% rename from pcommerce/core/browser/__init__.py rename to src/pcommerce/core/browser/__init__.py diff --git a/pcommerce/core/browser/address.pt b/src/pcommerce/core/browser/address.pt similarity index 98% rename from pcommerce/core/browser/address.pt rename to src/pcommerce/core/browser/address.pt index a8bc1a3..0485229 100644 --- a/pcommerce/core/browser/address.pt +++ b/src/pcommerce/core/browser/address.pt @@ -207,11 +207,11 @@
- -
@@ -345,4 +345,4 @@
- \ No newline at end of file + diff --git a/pcommerce/core/browser/cart.pt b/src/pcommerce/core/browser/cart.pt similarity index 100% rename from pcommerce/core/browser/cart.pt rename to src/pcommerce/core/browser/cart.pt diff --git a/pcommerce/core/browser/cart.py b/src/pcommerce/core/browser/cart.py similarity index 79% rename from pcommerce/core/browser/cart.py rename to src/pcommerce/core/browser/cart.py index 39fdd9b..4235783 100644 --- a/pcommerce/core/browser/cart.py +++ b/src/pcommerce/core/browser/cart.py @@ -33,7 +33,11 @@ def products(self): @property @memoize def checkout(self): - return getToolByName(self.context, 'portal_membership').checkPermission(CheckOut, self.context) + noregistration = getToolByName(self.context, 'portal_properties').pcommerce_properties.noregistration_order + if noregistration: + return True + else: + return getToolByName(self.context, 'portal_membership').checkPermission(CheckOut, self.context) @property @memoize @@ -46,4 +50,4 @@ def taxincl(self): taxes = ITaxes(self.context) return {'tax': taxes.taxincl[0], 'taxname': taxes.taxincl[1]} - \ No newline at end of file + diff --git a/pcommerce/core/browser/checkout.pt b/src/pcommerce/core/browser/checkout.pt similarity index 100% rename from pcommerce/core/browser/checkout.pt rename to src/pcommerce/core/browser/checkout.pt diff --git a/pcommerce/core/browser/checkout.py b/src/pcommerce/core/browser/checkout.py similarity index 100% rename from pcommerce/core/browser/checkout.py rename to src/pcommerce/core/browser/checkout.py diff --git a/pcommerce/core/browser/components/__init__.py b/src/pcommerce/core/browser/components/__init__.py similarity index 100% rename from pcommerce/core/browser/components/__init__.py rename to src/pcommerce/core/browser/components/__init__.py diff --git a/pcommerce/core/browser/components/address.pt b/src/pcommerce/core/browser/components/address.pt similarity index 100% rename from pcommerce/core/browser/components/address.pt rename to src/pcommerce/core/browser/components/address.pt diff --git a/pcommerce/core/browser/components/address.py b/src/pcommerce/core/browser/components/address.py similarity index 100% rename from pcommerce/core/browser/components/address.py rename to src/pcommerce/core/browser/components/address.py diff --git a/pcommerce/core/browser/components/base.py b/src/pcommerce/core/browser/components/base.py similarity index 100% rename from pcommerce/core/browser/components/base.py rename to src/pcommerce/core/browser/components/base.py diff --git a/pcommerce/core/browser/components/configure.zcml b/src/pcommerce/core/browser/components/configure.zcml similarity index 100% rename from pcommerce/core/browser/components/configure.zcml rename to src/pcommerce/core/browser/components/configure.zcml diff --git a/pcommerce/core/browser/components/confirmation.pt b/src/pcommerce/core/browser/components/confirmation.pt similarity index 100% rename from pcommerce/core/browser/components/confirmation.pt rename to src/pcommerce/core/browser/components/confirmation.pt diff --git a/pcommerce/core/browser/components/confirmation.py b/src/pcommerce/core/browser/components/confirmation.py similarity index 100% rename from pcommerce/core/browser/components/confirmation.py rename to src/pcommerce/core/browser/components/confirmation.py diff --git a/pcommerce/core/browser/components/gtc.pt b/src/pcommerce/core/browser/components/gtc.pt similarity index 91% rename from pcommerce/core/browser/components/gtc.pt rename to src/pcommerce/core/browser/components/gtc.pt index 243d98a..ec3d1a8 100644 --- a/pcommerce/core/browser/components/gtc.pt +++ b/src/pcommerce/core/browser/components/gtc.pt @@ -13,7 +13,7 @@ The Error - \ No newline at end of file + diff --git a/pcommerce/core/browser/components/gtc.py b/src/pcommerce/core/browser/components/gtc.py similarity index 100% rename from pcommerce/core/browser/components/gtc.py rename to src/pcommerce/core/browser/components/gtc.py diff --git a/pcommerce/core/browser/components/overview.pt b/src/pcommerce/core/browser/components/overview.pt similarity index 100% rename from pcommerce/core/browser/components/overview.pt rename to src/pcommerce/core/browser/components/overview.pt diff --git a/pcommerce/core/browser/components/overview.py b/src/pcommerce/core/browser/components/overview.py similarity index 100% rename from pcommerce/core/browser/components/overview.py rename to src/pcommerce/core/browser/components/overview.py diff --git a/pcommerce/core/browser/components/payment.pt b/src/pcommerce/core/browser/components/payment.pt similarity index 100% rename from pcommerce/core/browser/components/payment.pt rename to src/pcommerce/core/browser/components/payment.pt diff --git a/pcommerce/core/browser/components/payment.py b/src/pcommerce/core/browser/components/payment.py similarity index 100% rename from pcommerce/core/browser/components/payment.py rename to src/pcommerce/core/browser/components/payment.py diff --git a/pcommerce/core/browser/components/payments.pt b/src/pcommerce/core/browser/components/payments.pt similarity index 100% rename from pcommerce/core/browser/components/payments.pt rename to src/pcommerce/core/browser/components/payments.pt diff --git a/pcommerce/core/browser/components/payments.py b/src/pcommerce/core/browser/components/payments.py similarity index 100% rename from pcommerce/core/browser/components/payments.py rename to src/pcommerce/core/browser/components/payments.py diff --git a/pcommerce/core/browser/components/shipment.pt b/src/pcommerce/core/browser/components/shipment.pt similarity index 100% rename from pcommerce/core/browser/components/shipment.pt rename to src/pcommerce/core/browser/components/shipment.pt diff --git a/pcommerce/core/browser/components/shipment.py b/src/pcommerce/core/browser/components/shipment.py similarity index 100% rename from pcommerce/core/browser/components/shipment.py rename to src/pcommerce/core/browser/components/shipment.py diff --git a/pcommerce/core/browser/components/shipments.pt b/src/pcommerce/core/browser/components/shipments.pt similarity index 100% rename from pcommerce/core/browser/components/shipments.pt rename to src/pcommerce/core/browser/components/shipments.pt diff --git a/pcommerce/core/browser/components/shipments.py b/src/pcommerce/core/browser/components/shipments.py similarity index 100% rename from pcommerce/core/browser/components/shipments.py rename to src/pcommerce/core/browser/components/shipments.py diff --git a/pcommerce/core/browser/configlet.pt b/src/pcommerce/core/browser/configlet.pt similarity index 89% rename from pcommerce/core/browser/configlet.pt rename to src/pcommerce/core/browser/configlet.pt index fd90b67..7dd96e3 100644 --- a/pcommerce/core/browser/configlet.pt +++ b/src/pcommerce/core/browser/configlet.pt @@ -133,7 +133,33 @@ tal:attributes="value request/email_address|view/values/email_address|nothing"/> + +
+ +
+ +
+ + + +
+ Should the order process avaible for non Plone Portal Member +
+ +
+ The Error +
+
+
Taxes @@ -167,11 +193,9 @@ - - The Error - PCommerce order + False diff --git a/pcommerce/core/profiles/default/rolemap.xml b/src/pcommerce/core/profiles/default/rolemap.xml similarity index 100% rename from pcommerce/core/profiles/default/rolemap.xml rename to src/pcommerce/core/profiles/default/rolemap.xml diff --git a/pcommerce/core/profiles/default/skins.xml b/src/pcommerce/core/profiles/default/skins.xml similarity index 100% rename from pcommerce/core/profiles/default/skins.xml rename to src/pcommerce/core/profiles/default/skins.xml diff --git a/pcommerce/core/profiles/default/types.xml b/src/pcommerce/core/profiles/default/types.xml similarity index 100% rename from pcommerce/core/profiles/default/types.xml rename to src/pcommerce/core/profiles/default/types.xml diff --git a/pcommerce/core/profiles/default/types/Folder.xml b/src/pcommerce/core/profiles/default/types/Folder.xml similarity index 100% rename from pcommerce/core/profiles/default/types/Folder.xml rename to src/pcommerce/core/profiles/default/types/Folder.xml diff --git a/pcommerce/core/profiles/default/types/Price.xml b/src/pcommerce/core/profiles/default/types/Price.xml similarity index 100% rename from pcommerce/core/profiles/default/types/Price.xml rename to src/pcommerce/core/profiles/default/types/Price.xml diff --git a/pcommerce/core/profiles/default/types/Product.xml b/src/pcommerce/core/profiles/default/types/Product.xml similarity index 100% rename from pcommerce/core/profiles/default/types/Product.xml rename to src/pcommerce/core/profiles/default/types/Product.xml diff --git a/pcommerce/core/profiles/default/types/Variation.xml b/src/pcommerce/core/profiles/default/types/Variation.xml similarity index 100% rename from pcommerce/core/profiles/default/types/Variation.xml rename to src/pcommerce/core/profiles/default/types/Variation.xml diff --git a/pcommerce/core/profiles/default/viewlets.xml b/src/pcommerce/core/profiles/default/viewlets.xml similarity index 100% rename from pcommerce/core/profiles/default/viewlets.xml rename to src/pcommerce/core/profiles/default/viewlets.xml diff --git a/pcommerce/core/registry.py b/src/pcommerce/core/registry.py similarity index 100% rename from pcommerce/core/registry.py rename to src/pcommerce/core/registry.py diff --git a/pcommerce/core/required.py b/src/pcommerce/core/required.py similarity index 100% rename from pcommerce/core/required.py rename to src/pcommerce/core/required.py diff --git a/pcommerce/core/setuphandlers.py b/src/pcommerce/core/setuphandlers.py similarity index 100% rename from pcommerce/core/setuphandlers.py rename to src/pcommerce/core/setuphandlers.py diff --git a/pcommerce/core/skins/pcommerce/pcommerce.css.dtml b/src/pcommerce/core/skins/pcommerce/pcommerce.css.dtml similarity index 100% rename from pcommerce/core/skins/pcommerce/pcommerce.css.dtml rename to src/pcommerce/core/skins/pcommerce/pcommerce.css.dtml diff --git a/pcommerce/core/steps.py b/src/pcommerce/core/steps.py similarity index 100% rename from pcommerce/core/steps.py rename to src/pcommerce/core/steps.py diff --git a/src/pcommerce/core/testing.py b/src/pcommerce/core/testing.py new file mode 100644 index 0000000..3223849 --- /dev/null +++ b/src/pcommerce/core/testing.py @@ -0,0 +1,82 @@ +from plone.testing.z2 import ZSERVER_FIXTURE + +import transaction +from Testing import ZopeTestCase as ztc +from OFS.Folder import Folder + +from plone.testing import z2 + +from plone.app.testing import PloneSandboxLayer +from plone.app.testing import PLONE_FIXTURE +from plone.app.testing import IntegrationTesting +from plone.app.testing import FunctionalTesting +from plone.app.testing import applyProfile +from plone.app.testing import quickInstallProduct +from plone.app.testing import ploneSite + +class pcommerceCoreTddLayer(PloneSandboxLayer): + + defaultBases = (PLONE_FIXTURE,) + + #We create our own Session + class Session(dict): + def set(self, key, value): + self[key] = value + + def setUpZope(self, app, configurationContext): + # Load ZCML + import pcommerce.core + import Products.SingleKeywordWidget + import pcommerce.shipment.parcel + import pcommerce.payment.invoice + import collective.MockMailHost + self.loadZCML(package=pcommerce.core) + self.loadZCML(package=pcommerce.shipment.parcel) + self.loadZCML(package=pcommerce.payment.invoice) + self.loadZCML(package=Products.SingleKeywordWidget) + self.loadZCML(package=collective.MockMailHost) + + # Install product and call its initialize() function + z2.installProduct(app, 'pcommerce.core') + z2.installProduct(app, 'pcommerce.shipment.parcel') + z2.installProduct(app, 'pcommerce.shipment.invoice') + z2.installProduct(app, 'collective.MockMailHost') + + # Note: you can skip this if my.product is not a Zope 2-style + # product, i.e. it is not in the Products.* namespace and it + # does not have a directive in its + # configure.zcml. + + # ------------------------------------------------------------------------- + # support for sessions without invalidreferences if using zeo temp storage + # ------------------------------------------------------------------------- + app.REQUEST['SESSION'] = self.Session() + if not hasattr(app, 'temp_folder'): + tf = Folder('temp_folder') + app._setObject('temp_folder', tf) + transaction.commit() + ztc.utils.setupCoreSessions(app) + + def setUpPloneSite(self, portal): + # Install into Plone site using portal_setup + quickInstallProduct(portal, 'pcommerce.core') + quickInstallProduct(portal, 'pcommerce.shipment.parcel') + quickInstallProduct(portal, 'pcommerce.shipment.invoice') + quickInstallProduct(portal, 'collective.MockMailHost') + + def tearDownZope(self, app): + # Uninstall product + z2.uninstallProduct(app, 'pcommerce.core') + z2.uninstallProduct(app, 'pcommerce.shipment.parcel') + z2.uninstallProduct(app, 'pcommerce.shipment.invoice') + z2.uninstallProduct(app, 'collective.MockMailHost') + +PCOMMERCE_TDD_FIXTURE = pcommerceCoreTddLayer() + +PCOMMERCE_TDD_INTEGRATION_TESTING = IntegrationTesting( + bases=(PCOMMERCE_TDD_FIXTURE,), + name="pcommerceTddLayer:Integration") + +PCOMMERCE_TDD_ACCEPTANCE_TESTING = FunctionalTesting( + bases=(PCOMMERCE_TDD_FIXTURE, ZSERVER_FIXTURE), + name="pcommerceTddLayer:Acceptance") diff --git a/src/pcommerce/core/tests/__init__.py b/src/pcommerce/core/tests/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/pcommerce/core/tests/acceptance/test_pcommerce_core.txt b/src/pcommerce/core/tests/acceptance/test_pcommerce_core.txt new file mode 100644 index 0000000..aade4b2 --- /dev/null +++ b/src/pcommerce/core/tests/acceptance/test_pcommerce_core.txt @@ -0,0 +1,101 @@ +*** Settings *** + +Library Selenium2Library run_on_failure=Capture Page Screenshot +Variables plone/app/testing/interfaces.py + +Resource plone/act/keywords.txt + +Suite Setup Start browser +Suite Teardown Close All Browsers + +*** Variables *** + +${front-page} http://localhost:55001/plone/ +${test-folder} http://localhost:55001/plone/pcommerce-test-folder +${control-panel} http://localhost:55001/plone/@@overview-controlpanel + +${PORT} = 55001 +${ZOPE_URL} = http://localhost:${PORT} +${PLONE_URL} = ${ZOPE_URL}/plone + +*** Keywords *** + +Start browser + Open browser ${front-page} + +Create Product + [Arguments] ${title} + Go to ${front-page}/createObject?type_name=Product + Input text title ${title} + Click Button Save + +Go through checkout + Go to ${front-page}/my-product + Click Button add to cart + Go to ${front-page}/@@cart + Click Button Check out + Input text firstname My firstname + Input text lastname My lastname + Input text address1 My address1 + Input text zip 000000 + Input text city My city + Input text country My country + Input text email email@email.com + Input text phone 000000 0000 + +*** Test Cases *** + +Test Noregistration switch visible + Log in as site owner + Go to ${front-page}/@@pcommerce_configlet + + Element Should Be Visible id=noregistration_order + +Test Registration needed + Log in as site owner + Create Product My product + Page should contain Changes saved. + Log out + Go to ${front-page}/my-product + Click Button add to cart + Page should contain Added item to cart + Go to ${front-page}/@@cart + + Page should contain You have to be registered to check out your order, + +Test No Registration needed + Log in as site owner + Create Product My product + Page should contain Changes saved. + Go to ${front-page}/@@pcommerce_configlet + Click Element id=noregistration_order + Click Button Save + Page should contain Properties saved + Log out + Go to ${front-page}/my-product + Click Button add to cart + Go to ${front-page}/@@cart + + Page should not contain You have to be registered to check out your order, + +Test Go through checkout as anonymous + Log in as site owner + Create Product My product + Page should contain Changes saved. + Go to ${front-page}/@@pcommerce_configlet + Click Element id=noregistration_order + Click Button Save + Page should contain Properties saved + Log out + Go through checkout + Click Button Next step + Page should contain equal to billing address + Click Button Next step + Page should contain equal to customer address + Click Button Next step + Page should contain Overview + Click Element id=gtc_box + Click Button Send order + Page should contain We successfully received your order. + + diff --git a/src/pcommerce/core/tests/test_acceptance.py b/src/pcommerce/core/tests/test_acceptance.py new file mode 100644 index 0000000..fb7ada5 --- /dev/null +++ b/src/pcommerce/core/tests/test_acceptance.py @@ -0,0 +1,21 @@ +import os +import unittest + +from plone.testing import layered + +import robotsuite + +from pcommerce.core.testing import PCOMMERCE_TDD_ACCEPTANCE_TESTING + +def test_suite(): + suite = unittest.TestSuite() + current_dir = os.path.abspath(os.path.dirname(__file__)) + acceptance_dir = os.path.join(current_dir, 'acceptance') + acceptance_tests = [os.path.join('acceptance', doc) for doc in + os.listdir(acceptance_dir) if doc.endswith('.txt')] + for test in acceptance_tests: + suite.addTests([ + layered(robotsuite.RobotTestSuite(test), + layer=PCOMMERCE_TDD_ACCEPTANCE_TESTING), + ]) + return suite diff --git a/src/pcommerce/core/tests/test_integration.py b/src/pcommerce/core/tests/test_integration.py new file mode 100644 index 0000000..3e7222e --- /dev/null +++ b/src/pcommerce/core/tests/test_integration.py @@ -0,0 +1,36 @@ +import unittest2 as unittest + +from zope.component import getUtility + +from plone.app.testing import PloneSandboxLayer +from plone.app.testing import PLONE_FIXTURE +from plone.app.testing import IntegrationTesting +from plone.app.testing import applyProfile +from plone.app.testing import quickInstallProduct +from plone.app.testing import ploneSite +from plone.app.testing import setRoles +from plone.app.testing import TEST_USER_ID +from plone.app.testing import SITE_OWNER_NAME, SITE_OWNER_PASSWORD + +from plone.testing.z2 import Browser + +from Products.CMFCore.utils import getToolByName + +from pcommerce.core.testing import PCOMMERCE_TDD_INTEGRATION_TESTING + +class PcommerceTest(unittest.TestCase): + + layer = PCOMMERCE_TDD_INTEGRATION_TESTING + + def test_pcommerce_content_type_installed(self): + portal = self.layer['portal'] + typesTool = getToolByName(portal, 'portal_types') + self.assertNotEqual(typesTool.getTypeInfo('Product'), None) + + def test_content_creation(self): + portal = self.layer['portal'] + setRoles(portal, TEST_USER_ID, ['Manager']) + portal.invokeFactory('Product', 'TestProduct', shipments='pcommerce.shipment.parcel',title='TestProduct') + product = portal['TestProduct'] + self.assertEqual(product.Title(), u"TestProduct") + diff --git a/pcommerce/core/vocabulary.py b/src/pcommerce/core/vocabulary.py similarity index 100% rename from pcommerce/core/vocabulary.py rename to src/pcommerce/core/vocabulary.py diff --git a/travis.cfg b/travis.cfg new file mode 100644 index 0000000..cbbed81 --- /dev/null +++ b/travis.cfg @@ -0,0 +1,17 @@ +[buildout] +extends = buildout.cfg +parts = + download + install + test +eggs-directory = buildout-cache/eggs +download-cache = buildout-cache/downloads + +[download] +recipe = hexagonit.recipe.download +url = https://launchpad.net/plone/4.2/4.2.1/+download/Plone-4.2.1-UnifiedInstaller.tgz + +[install] +recipe = collective.recipe.cmd +on_install = true +cmds = tar jxvf ${download:location}/Plone-4.2.1-UnifiedInstaller/packages/buildout-cache.tar.bz2 1>/dev/null