alexs fadb1e4710 Merge branch 'master' of github.com:eaterprises/openfoodweb ...

Conflicts:
	Gemfile

2013-07-23 18:02:28 +10:00

..

bulk_product_update_spec.rb

Changed JavaScript driver from selenium to phantomjs.

2013-07-23 17:54:05 +10:00

cms_spec.rb

Update cms_admin spec work after Spree 1.3 upgrade broke it

2013-02-14 14:03:14 +11:00

enterprise_fees_spec.rb

Changed JavaScript driver from selenium to phantomjs.

2013-07-23 17:54:05 +10:00

enterprises_spec.rb

Lengthen Capybara.default_wait_time for tests that fail due to long load time

2013-02-15 10:31:41 +11:00

order_cycles_spec.rb

Lengthen Capybara.default_wait_time for tests that fail due to long load time

2013-02-15 10:31:41 +11:00

order_spec.rb

Merge branch 'add-capture-order-shortcut-deface'

2013-07-23 16:55:33 +10:00

product_spec.rb

Upgrade capybara, spec/requests changed to spec/features

2013-01-15 10:10:24 +11:00

reports_spec.rb

Order cycle reports are precise to time of day, not just date

2013-04-25 21:22:26 +10:00

shipping_methods_spec.rb

Fix selection of itemwise shipping method that broke after the spree upgrade.

2013-07-23 15:46:07 +10:00