321 Commits

Author	SHA1	Message	Date
Rohan Mitchell	05c62634fc	Further overlapping elements fixes	2014-06-05 14:49:41 +10:00
Rohan Mitchell	2bedc431e8	Fix spec fragility - overlapping elements error	2014-06-05 13:43:41 +10:00
Rob H	1d5cc5dced	Adding specs for new product creation	2014-05-30 16:38:29 +10:00
Rob H	66d6de9dfc	Merge master (with primary taxons restored)	2014-05-30 15:45:48 +10:00
Rob H	69376e7f4b	Merge in master	2014-05-30 15:10:13 +10:00
Will Marshall	be640fd856	Patching a spec and naming something	2014-05-30 15:02:47 +10:00
Will Marshall	a7340df6a5	Removing some dud test content	2014-05-30 14:45:27 +10:00
Will Marshall	b736145552	Adding primary taxon to admin forms ... Conflicts: db/migrate/20140522044009_add_primary_taxon_to_products.rb spec/features/admin/products_spec.rb	2014-05-30 14:31:27 +10:00
Will Marshall	2b0bdc69cd	Fixing a scope issue	2014-05-30 13:01:16 +10:00
Will Marshall	638d6d2ac0	Moving around the authentication specs	2014-05-30 12:58:58 +10:00
Will Marshall	b757629bfa	Minor test tweaks	2014-05-29 11:52:46 +10:00
Rohan Mitchell	cc2498bb9b	Fix spec fails - group buy and available on removed from new product form	2014-05-24 18:26:02 +10:00
Rohan Mitchell	acbe49b8de	Revert primary taxons	2014-05-24 17:13:01 +10:00
Will Marshall	0a8f5d91ba	Adding primary taxon to admin forms	2014-05-24 09:29:26 +10:00
Rohan Mitchell	79393476b0	Revert "Adding primary taxon to admin forms" ... This reverts commit 110a6f2d14.	2014-05-24 09:07:56 +10:00
Will Marshall	110a6f2d14	Adding primary taxon to admin forms	2014-05-23 15:59:06 +10:00
Rohan Mitchell	9b15c213d1	When an enterprise user saves an order cycle for which it manages only some of the enterprises involved, do not delete the other exchanges	2014-05-23 11:28:00 +10:00
Will Marshall	015403c282	Merge branch 'new_shop'	2014-05-22 12:40:48 +10:00
Will Marshall	c69a4a5f1a	Adding social media links	2014-05-22 12:12:10 +10:00
Rohan Mitchell	a16f726377	Extract have_relationship test	2014-05-22 11:32:37 +10:00
Rohan Mitchell	c2f762d570	Enterprise user can only see relationships involving their enterprises	2014-05-22 11:27:19 +10:00
Rohan Mitchell	06955a024f	Enterprise user can only create relationships with their own enterprises as parent	2014-05-22 11:02:03 +10:00
Rohan Mitchell	48a7b9c3f8	Fix specs from 'X permits Y' table format change	2014-05-22 08:50:52 +10:00
Rohan Mitchell	5d0680234d	Admin can delete enterprise relationships	2014-05-21 11:29:11 +10:00
Rohan Mitchell	b9a9937541	Attempting to create a relationship with invalid data shows an error message	2014-05-21 11:29:11 +10:00
Rohan Mitchell	9b2a80c6b5	Admin can create enterprise relationships	2014-05-21 11:29:11 +10:00
Rohan Mitchell	5f4e4ebeb0	Admin can list enterprise relationships	2014-05-21 11:29:11 +10:00
Will Marshall	61cf35a5b9	Adding attr_accessors and paperclip file uploads	2014-05-20 12:18:28 +10:00
Will Marshall	0958602418	Starting on migrations and admin forms	2014-05-20 12:18:27 +10:00
Rob H	fd6f4d04df	Merge branch 'master' into ent-makeover	2014-05-15 17:05:05 +10:00
Rob H	7cdfb4bab2	Add methods and fees to sidebar on enterprise edit page	2014-05-15 14:52:19 +10:00
Rohan Mitchell	a2205d3f93	Make order cycles spec consistent	2014-05-14 15:50:25 +10:00
Rob H	31334be615	Tidy up of new dashboard, add 'CREATE NEW' button at top right	2014-05-14 11:31:42 +10:00
Will Marshall	f25617dde7	Tweaks for laura, reworking authentication workflow, tidying up checkout	2014-05-09 16:42:51 +10:00
Rohan Mitchell	87b605b604	Remove specific default_wait_time setting in BOM - this value is globally increased in spec_helper	2014-05-09 08:55:44 +10:00
Rob H	169d5669f1	Amend specs	2014-05-07 13:34:47 +10:00
Rob H	dcf048d631	Merge branch 'temp' into ng-cleanup	2014-05-07 13:08:13 +10:00
Rob H	fe5d015778	Merging in master	2014-05-07 13:07:11 +10:00
Rob H	2e7cf612d6	Fix broken BOM spec	2014-05-07 12:30:06 +10:00
Will Marshall	bbb70342b3	Merging	2014-05-02 15:35:43 +10:00
Rob H	ceada3596b	Merge master into cleanup	2014-05-02 14:43:06 +10:00
Rohan Mitchell	1d5f0042d4	Remove sleeps - these should be covered by increased capybara wait time now	2014-05-02 14:25:32 +10:00
Rohan Mitchell	930bc2b7ce	Set increased Capybara.default_wait_time globally	2014-05-02 14:25:32 +10:00
Rohan Mitchell	c9aefa507a	Remove chili	2014-05-02 14:25:32 +10:00
Will Marshall	705e247eb8	Tweaking the bulk order management spec again	2014-05-02 12:41:04 +10:00
Will Marshall	8c319334db	Cleaning out the spree auth stuff	2014-05-02 12:34:19 +10:00
Will Marshall	d7f8d2f5c7	Reworking some broken tests	2014-04-29 15:13:59 +10:00
Rohan Mitchell	126ddd0a75	Add explicit wait before inconsistently failing lookup	2014-04-25 18:59:33 +10:00
Rohan Mitchell	c8f50216ab	Increase default_wait_time on order_cycles_spec in an attempt to prevent inconsistent failures in CI	2014-04-25 18:06:09 +10:00
Rohan Mitchell	91d9b546d2	Merge branch 'foreign-keys'	2014-04-25 16:06:54 +10:00