Rohan Mitchell 4a30f27b3d Merge branch '266reportsbranch' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-266reportsbranch ...

Conflicts:
	app/controllers/spree/admin/reports_controller_decorator.rb
	spec/models/spree/order_spec.rb

2014-12-19 09:38:02 +11:00

..

authentication_spec.rb

Hopefully fixing Poltergeist Timeout error due to long long time for first admin spec

2014-11-27 14:42:02 +11:00

bulk_order_management_spec.rb

Shaving some seconds from BOM spec by using simple order cycles and splitting specs up into more logical contexts

2014-12-12 15:43:05 +11:00

bulk_product_update_spec.rb

Rename div update-status-message to status-message

2014-12-12 13:33:13 +11:00

cms_spec.rb

Reworking some broken tests

2014-04-29 15:13:59 +10:00

enterprise_fees_spec.rb

Set increased Capybara.default_wait_time globally

2014-05-02 14:25:32 +10:00

enterprise_groups_spec.rb

Adding attr_accessors and paperclip file uploads

2014-05-20 12:18:28 +10:00

enterprise_relationships_spec.rb

can specify attributes for create_enterpise_user

2014-09-25 11:56:18 +10:00

enterprise_roles_spec.rb

Delete specific E2ER in spec

2014-09-11 14:54:51 +10:00

enterprise_user_spec.rb

Merge branch 'master' into migrate_ent_types

2014-10-01 16:11:20 +10:00

enterprises_spec.rb

Fix brittle spec

2014-11-05 16:08:45 +11:00

image_settings_spec.rb

Admin can change the format that Spree::Images are stored/served in

2014-10-16 12:41:11 +11:00

order_cycles_spec.rb

Using simple_order_cycle in spec

2014-11-28 14:45:35 +11:00

orders_spec.rb

Fix specs: feature specs requiring payment and shipping methods, race condition, double flash message issue

2014-11-01 12:11:50 +11:00

overview_spec.rb

Adding specs for single ent dash and remove product ability for profiles

2014-10-24 15:27:08 +11:00

payment_method_spec.rb

Can change hub after changing pm type

2014-08-09 11:23:05 +10:00

products_spec.rb

Edit product form shows permitted suppliers

2014-09-12 11:33:47 +10:00

reports_spec.rb

Merge branch '266reportsbranch' of https://github.com/lin-d-hop/openfoodnetwork into lin-d-hop-266reportsbranch

2014-12-19 09:38:02 +11:00

shipping_methods_spec.rb

Remove shipping category from admin edit shipping methods

2014-06-19 18:31:52 +10:00

variant_overrides_spec.rb

Creating and then updating the new override updates the same override instead of creating a duplicate

2014-12-12 13:33:14 +11:00

variants_spec.rb

Consistency

2014-10-16 12:08:12 +11:00