raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-30 21:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,293 Commits 18 Branches 452 Tags
fb412cd9cd6452c2587f620fd8babe5297fcf44f
Commit Graph

1228 Commits

Author SHA1 Message Date
luisramos0
728ed2c202 Move features/admin/reports/enterprise_fee_summaries_spec to xdescribe (will be fixed as part of spree upgrade phase 2) 2019-02-13 09:06:10 +00:00
luisramos0
c652cfe4d5 Merge branch 'master' into 2-0-stable-Feb12 2019-02-12 16:03:33 +00:00
Pau Pérez Fabregat
a0c144fd0c Merge pull request #3415 from openfoodfoundation/feature/enterprise_fee_summary 
[Enterprise Fee Summary] Merge "Enterprise Fee Summary" report to master
 2019-02-12 13:58:47 +01:00
Pau Pérez Fabregat
92dca0cdfa Merge pull request #3194 from HugsDaniel/3109-fix-orders-new 
[Spree Upgrade] Fix admin new order page
 2019-02-12 09:58:29 +01:00
Matt-Yorkley
097ffba323 Fix broken spec from refactored method 2019-02-11 23:57:13 +00:00
Luis Ramos
dd44d6a0ca Merge pull request #3355 from luisramos0/2-0-pord-importer-spec 
[Spree Upgrade] Phase 2 - Fix product_importer spec
 2019-02-11 15:28:47 +00:00
Pau Pérez Fabregat
9d065c8a0b Merge pull request #3233 from Matt-Yorkley/pi/inventories 
Pi/inventories
 2019-02-11 16:10:33 +01:00
Pau Pérez Fabregat
da09c8f86c Merge pull request #3467 from kristinalim/fix/3455-intermittent_spec_failure 
3455 [Flaky Spec] Do not expect modal still open when checking that the spinner is gone
 2019-02-11 15:58:22 +01:00
Kristina Lim
0032a237a2 Wait for button to disappear before checking flash 2019-02-10 22:08:18 +08:00
Kristina Lim
175264f41f Use flash matcher in shipping method feature specs 2019-02-10 22:08:18 +08:00
Kristina Lim
f143540d0c Do not expect modal open when checking spinner gone 
The element referenced in the following might no longer be visible:

  within "div.reveal-modal"
 2019-02-09 22:40:40 +08:00
Kristina Lim
461b5725d1 Hide report link and resource from non-superadmins 2019-02-08 21:26:38 +00:00
Kristina Lim
c8b154b12a Separate enterprise fee summary action 
Split the previous "index" action into "new" and "create" actions.
 2019-02-08 21:26:38 +00:00
Kristina Lim
a17fa8013f Clean up I18n scope in feature specs for report 2019-02-08 21:26:38 +00:00
Kristina Lim
c0e6b70131 Rename EnterpriseFeeSummaryReportController 
Remove "Report" because this is redundant, and pluralize the resource
name.
 2019-02-08 21:26:38 +00:00
Kristina Lim
2063752b97 Improve specs for Enterprise Fee Summary 
This also addresses a spec that has failed over the rebasing.
 2019-02-08 21:26:38 +00:00
Kristina Lim
dcb1d9fe25 Add feature tests for enterprise fee summary 2019-02-08 21:26:37 +00:00
Kristina Lim
edf0b0df76 Add navigation item for enterprise fee summary 2019-02-08 21:26:37 +00:00
Pau Pérez Fabregat
56425139c0 Merge pull request #3439 from luisramos0/2-0-stable-Feb5 
[Spree Upgrade] Merging master into 2-0-stable (1st run in Feb2019)
 2019-02-07 15:09:23 +01:00
luisramos0
fe0fb22814 Improve readability in admin/orders_spec 2019-02-07 13:45:04 +00:00
Kristina Lim
428e58f8f7 Remove unused have_no_selector argument in feature test 2019-02-07 04:39:44 +08:00
Kristina Lim
fdede83086 Support selecting date in next months 
This was causing failures when selecting tomorrow when running tests on
the last day of the month.
 2019-02-07 04:39:43 +08:00
Kristina Lim
bb51f7e36b Improve sync between keyword filter and selecting all 2019-02-07 04:36:28 +08:00
Kristina Lim
3eedee313e Wait for datepicker to associate and open before selecting date 2019-02-07 04:36:24 +08:00
Pau Pérez Fabregat
8f63be9519 Merge pull request #2733 from kristinalim/fix-subscription_should_not_require_future_oc 
Reduce restrictions for adding a variant to a subscription
 2019-02-06 21:24:57 +01:00
Luis Ramos
11304ef6fd Merge pull request #3371 from luisramos0/2-0-xero-invoices 
[Spree Upgrade] Fix xero invoices report specs
 2019-02-06 16:48:49 +00:00
luisramos0
1b8445eb99 Merge branch 'master' into 2-0-stable-Feb5 2019-02-05 11:16:23 +00:00
luisramos0
698ba4618d Adapt customer search override to spree v2 and fix customer details spec in admin orders spec 2019-02-04 18:58:02 +00:00
luisramos0
e5fdc89659 Fix distributor change spec in admin orders spec 2019-02-04 18:58:01 +00:00
luisramos0
c612df5174 Fix admin orders spec non tax adjustments by adapting to new view 2019-02-04 18:58:01 +00:00
Hugo Daniel
c823f942b4 Fix failing specs due to Spree 2's new order admin page 
Add missing form tag and OC and shops injectors on order form to make the OC field, the distributor field and the update button work
 2019-02-04 18:57:51 +00:00
Luis Ramos
4b133bbc31 Merge pull request #3412 from kristinalim/fix/3059-race_condition_in_enterprise_image_specs 
3059 [Flaky Spec] Fix race condition in enterprise image feature specs
 2019-02-03 19:32:11 +00:00
Luis Ramos
a0b5509850 Merge pull request #3430 from kristinalim/fix/3420-intermittent_spec_failures 
3420 [Flaky Spec] Fix date format in spec when single-digit day of month
 2019-02-03 19:30:22 +00:00
Kristina Lim
4bff256f6d Match date format in spec with import date filter 
This was failing if the current day of month only has one digit. The
test could not find the date in the import date filter.

Before this commit, the resulting string in the test replaced "  " with
" ", so "February  2" was being changed to "February 2". The import date
filter however uses two spaces in this case, even if the browser shows
only one (HTML inline text renders two spaces as just one).
 2019-02-02 01:43:52 +08:00
Pau Pérez Fabregat
e1fb005e70 Merge pull request #3387 from kristinalim/fix/3384-product_import_timeout 
3384 [Product Import] Process only one batch of rows at a time
 2019-02-01 17:29:04 +01:00
Pau Pérez Fabregat
faea876ff0 Merge pull request #3361 from luisramos0/2-0-report-spec 
[Spree Upgrade] Phase 2 - Fix some specs in reports_spec and in lettuce share report
 2019-02-01 08:26:55 +01:00
Kristina Lim
65438e2619 Refactor checking no preview image in specs 2019-01-31 05:04:18 +08:00
Kristina Lim
a3c808a172 Refactor checking of preview image path in specs 2019-01-31 05:02:57 +08:00
Kristina Lim
777712a0e9 Fix race condition in enterprise image feature specs 2019-01-31 04:52:40 +08:00
luisramos0
f6e6f67e7d Switch Spree::Config test setup with a mock in reports_spec to keep global test setup untouched 2019-01-30 15:03:23 +00:00
luisramos0
dce2524353 Added now mandatory shipping_category_id to CSVs in tests in admin/product_import_spec 2019-01-29 14:55:19 +00:00
luisramos0
729feb16f1 Merge branch 'master' into 2-0-stable-jan-29th 2019-01-29 12:38:34 +00:00
Kristina Lim
2129ab991b Load enterprise users tab before inspecting table 2019-01-26 12:11:41 +08:00
Kristina Lim
c33808e8f5 Extract some actions in tests into methods 2019-01-26 02:03:56 +08:00
Kristina Lim
da4d6a092a Add spec helper for choosing today from datepicker 2019-01-26 02:03:56 +08:00
Kristina Lim
c23002102c Add warning for unavailable subscription items 2019-01-26 02:03:55 +08:00
Kristina Lim
929290fc77 Reduce restrictions for creating subscriptions 
Allow the following variants:

* Variants of permitted producers
* Variants of hub
* Variants that are in outgoing exchanges where the hub is receiver
 2019-01-26 02:03:54 +08:00
Kristina Lim
d3f20289f8 Move setup of feature specs for creating subscriptions 2019-01-26 02:03:53 +08:00
Kristina Lim
28c70c7719 Fix nesting of specs for editing subscriptions 2019-01-26 02:03:53 +08:00
Kristina Lim
4425b0416d Rename import_data feature test method 2019-01-25 04:42:11 +08:00