Commit Graph

15608 Commits

Author SHA1 Message Date
Lynne Davis
079781576b Adding new specs and a couple updates the lib/report 2014-12-11 12:47:56 +00:00
Rob Harrington
b9011d9abe Remove obsolete spree checkout views 2014-12-11 16:17:15 +11:00
Rob Harrington
b7810df346 Revert "Removing obsolete checkout views"
This reverts commit d0e013c1a5.
2014-12-11 16:09:17 +11:00
Rob Harrington
dfb9e5bde5 Order reports now present the price of line items with adjustments included 2014-12-11 15:48:29 +11:00
Rohan Mitchell
eab2e5de2a Use scope 2014-12-11 15:00:44 +11:00
Rob Harrington
3be437485a Redirecting any spree checkout_state redirects to our checkout controller 2014-12-11 14:53:11 +11:00
Rob Harrington
d0e013c1a5 Removing obsolete checkout views 2014-12-11 14:50:29 +11:00
Maikel Linke
440044372b Leave-page-warning only after changing inputs
The enterprise form is now set 'dirty' whenever an input changes. The
navigation callback confirms to leave the page only if the form is
dirty.
2014-12-11 14:27:08 +11:00
Maikel Linke
76739a4746 Unify nav-check and nav-callback attributes in nav-check-callback
The value of nav-check was not used and nav-callback was only important
if nav-check was given. So we need only one attribute, now named
nav-check-callback.
2014-12-11 12:14:51 +11:00
Maikel Linke
11f1261dd3 Navigation Callbacks for WebKit 2014-12-11 12:07:48 +11:00
Maikel Linke
27896534f0 Navigation Callbacks (confirmation to leave) refs
A navigation callback could give only a fixed value at load time. Now it
can act depending on the site's state just before the page is unloaded.
2014-12-11 12:05:59 +11:00
Rob Harrington
2f83d71931 Adding mail/all.css to assets precompile list 2014-12-10 09:56:33 +11:00
Lynne Davis
f878e18037 Update that works better with the specs 2014-12-08 16:25:18 +00:00
Maikel Linke
3cc79d0036 Filter deleted products in products report
BugHerd 484: Remove deleted products from Product / Inventory reports
2014-12-05 15:52:10 +11:00
Maikel Linke
7b41d4c5d4 Denoting the product category as required
Using common style: span.required *
2014-12-05 14:56:32 +11:00
Rohan Mitchell
ec08ab4cc9 Merge pull request #307 from openfoodfoundation/replace-fixtures
Replacing fixtures with minimal seeding
2014-12-04 16:31:30 +11:00
Maikel Linke
5c191bcc7f Moving test seeding into spec/support/seeds.rb 2014-12-04 15:38:59 +11:00
Rohan Mitchell
19667f31fa Add missing translation for welcome_to 2014-12-03 15:19:25 +11:00
Rohan Mitchell
95f8334370 Reinstate style 2014-12-03 12:28:22 +11:00
Rohan Mitchell
50e26ed96f Remove old required partial 2014-12-03 12:22:43 +11:00
Rohan Mitchell
e30021537a Merge branch 'master' into enterprise-form-required-fields
Conflicts:
	app/views/admin/enterprises/_form.html.haml
	app/views/admin/enterprises/_ng_form.html.haml
2014-12-03 12:20:52 +11:00
Rohan Mitchell
bd7253bdda Merge branch 'using-simple-order-cycle' 2014-12-03 12:08:25 +11:00
Rohan Mitchell
fbef139fc5 Merge branch 'master' into using-simple-order-cycle 2014-12-03 11:57:59 +11:00
Lynne Davis
633a8a49e2 updating spec based on the wise advice of Rohan 2014-12-03 00:35:53 +00:00
Rohan Mitchell
3358fb3d73 Name based on meaning instead of context 2014-12-03 09:39:36 +11:00
Paul Mackay
26bca0faf8 Localize more strings on home page. 2014-12-03 09:39:36 +11:00
Paul Mackay
73ece4075c Add rails-i18n gem. 2014-12-03 09:39:35 +11:00
Lynne Davis
a5ae1c490c Fixing typo in report found through testing 2014-12-02 17:48:04 +00:00
Lynne Davis
c2c51a5531 Fixing typo in feature spec 2014-12-02 12:24:34 +00:00
Maikel Linke
8e280919ac Using simple_order_cycle in clone spec
Creating a coordinator fee and two exchanges in the spec instead of
using a full order_cycle. Timing of this single test:

Before: 15.32 seconds
After:   6.26 seconds
2014-11-28 15:36:34 +11:00
Maikel Linke
e240933b29 Using simple_order_cycle in spec
Before: 4 minutes 6.9 seconds
After:  3 minutes 27.4 seconds
2014-11-28 14:45:35 +11:00
Maikel Linke
349b7de11a Using simple_order_cycle
Before: 2 minutes 58.3 seconds
After:  35.04 seconds
2014-11-28 14:02:55 +11:00
Maikel Linke
73b8f37d77 Using simple_order_cycle
Before: 2 minutes 8.7 seconds
After:  16.11 seconds
2014-11-28 13:55:06 +11:00
Maikel Linke
aa2cefb88c Using simple_order_cycle where applicable
Before: 3 minutes 0 seconds
After:  1 minute 21.02 seconds
2014-11-28 13:45:25 +11:00
Maikel Linke
ccd03bfa84 Using simple_order_cycle
Test timings were not accurate. Output:
4 order_cycles: 9.94 seconds
2 order_cycles: 9.87 seconds
0 order_cycles: 9.9 seconds

Felt execution was much higher
2014-11-28 13:20:05 +11:00
Maikel Linke
7f764db4d7 Using simple_order_cycle
order_cycle: 1 minute 56.88 seconds
simple_order_cycle: 1 minute 8.05 seconds
2014-11-28 12:39:05 +11:00
Maikel Linke
082a3cd9ab Creating simple_order_cycle instead of order_cycle
Speedup on my machine:
 1 minute 44.52 seconds
 21.9 seconds
2014-11-28 12:29:47 +11:00
Lynne Davis
35c27bf516 First specs for additional scope to order model. Not liking the repeated code so would appreciate feedback to get rid of it. Thanks! 2014-11-27 20:36:41 +00:00
Rob Harrington
699c9a62a5 Removing pretty_inspect so that bugsnag alert work on production 2014-11-27 16:39:14 +11:00
Maikel Linke
ef0b0a9a94 Replacing fixtures with minimal seeding
Seeding:
 1 country: Australia
 2 states:  Vic, NSW
2014-11-27 16:38:39 +11:00
Rob Harrington
9782a9d3d6 Hopefully fixing Poltergeist Timeout error due to long long time for first admin spec 2014-11-27 14:42:02 +11:00
Rob Harrington
45bcee16ef Pulling out obsolete setup in BOM spec to make it more like BPE spec, see if that helps with intermittent fails 2014-11-27 09:44:13 +11:00
Rob Harrington
5799f09caf Merge branch 'master' into pretty-emails 2014-11-27 00:02:44 +11:00
Rob Harrington
38440dd70a Ammending checkout specs for two emails on placement of order 2014-11-26 23:16:11 +11:00
Rob Harrington
258573f5a6 Remove obsolete text version of user signup_confirmation 2014-11-26 18:58:26 +11:00
Rob Harrington
0cf2df8358 Remove obsolete text version of order confirm_email 2014-11-26 18:54:50 +11:00
Rob Harrington
8a3bffb37d Cart page conforms to convention in rest of checkout, adjusting helpers through checkout 2014-11-26 18:53:29 +11:00
Rob Harrington
8f27c643f1 Move override for cart line item into existing view replacement 2014-11-26 16:08:53 +11:00
Rob Harrington
a8dde3bbb9 Moving shopfront trial progress bar logic into enterprises helper and dealing with expiry 2014-11-26 15:16:53 +11:00
Rob Harrington
f5acf36771 Hiding enterprise shop url in ent welcome email, as that may bot actually make sense 2014-11-26 14:50:19 +11:00