raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-06 22:36:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,259 Commits 18 Branches 453 Tags
8aa7ef2e39b76e2339830483fd252df7ac15c29b
Commit Graph

22259 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Filipe
8aa7ef2e39 Merge pull request #8336 from jibees/8335-fix-flaky-embedded_shopfronts_spec 
Move embedded_shopfronts_spec as system spec
 2021-10-12 14:32:08 +01:00
Filipe
2d45e6b5b6 Merge pull request #8338 from jibees/8337-flaky-orders_spec 
Move orders_spec.rb as system spec
 2021-10-12 14:27:33 +01:00
Jean-Baptiste Bellet
059163c49d Move embedded_shopfronts_spec as system spec 2021-10-12 14:28:54 +02:00
Jean-Baptiste Bellet
d53ae3370d Move orders_spec.rb as system spec 2021-10-12 14:27:38 +02:00
Matt-Yorkley
ca5f18827a Merge pull request #8323 from openfoodfoundation/dependabot/npm_and_yarn/mrujs-0.5.5 
Bump mrujs from 0.5.4 to 0.5.5
 2021-10-12 13:55:50 +02:00
Matt-Yorkley
2a09ba11a2 Merge pull request #8322 from openfoodfoundation/dependabot/npm_and_yarn/jest-27.2.5 
Bump jest from 27.2.4 to 27.2.5
 2021-10-12 11:22:56 +02:00
Matt-Yorkley
adde85c8dd Merge pull request #8329 from mkllnk/checkout-spec 
Expect content after page is loaded
 2021-10-12 11:21:29 +02:00
Maikel
fff54d2aad Merge pull request #8321 from openfoodfoundation/dependabot/bundler/test-unit-3.4.8 
Bump test-unit from 3.4.7 to 3.4.8
 2021-10-12 16:09:37 +11:00
Maikel Linke
5a85fcd349 Expect content after page is loaded 
The login action takes some time and the spec wasn't waiting for that. I
suspected a race condition when AngularJS is initialising form values
and we are expecting certain values.
 2021-10-12 15:04:16 +11:00
Maikel
ccc73eb829 Merge pull request #8316 from jibees/5937-resolve-flaky-spec-on-shopping_spec 
resolve flaky spec on shopping spec
 2021-10-12 14:27:37 +11:00
Matt-Yorkley
3fe237b25d Merge pull request #8319 from filipefurtad0/account_folder_into_system_spec 
Updates and moves consumer/account folder into system
 2021-10-12 02:33:36 +02:00
Jean-Baptiste Bellet
0faab42c2a Fix Ruby 2.7 warning"Using the last argument as keyword parameters is deprecated;" 
https://bloggie.io/@kinopyo/how-to-fix-ruby-2-7-warning-using-the-last-argument-as-keyword-parameters-is-deprecated
 2021-10-11 14:56:11 +02:00
dependabot[bot]
ad99f80b12 Bump mrujs from 0.5.4 to 0.5.5 
Bumps [mrujs](https://github.com/ParamagicDev/mrujs) from 0.5.4 to 0.5.5.
- [Release notes](https://github.com/ParamagicDev/mrujs/releases)
- [Changelog](https://github.com/ParamagicDev/mrujs/blob/main/CHANGELOG.md)
- [Commits](https://github.com/ParamagicDev/mrujs/compare/v0.5.4...v0.5.5)

---
updated-dependencies:
- dependency-name: mrujs
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-11 09:07:19 +00:00
dependabot[bot]
91e5bac13a Bump jest from 27.2.4 to 27.2.5 
Bumps [jest](https://github.com/facebook/jest) from 27.2.4 to 27.2.5.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/main/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/compare/v27.2.4...v27.2.5)

---
updated-dependencies:
- dependency-name: jest
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-11 09:06:38 +00:00
dependabot[bot]
99214e8c1f Bump test-unit from 3.4.7 to 3.4.8 
Bumps [test-unit](https://github.com/test-unit/test-unit) from 3.4.7 to 3.4.8.
- [Release notes](https://github.com/test-unit/test-unit/releases)
- [Commits](https://github.com/test-unit/test-unit/compare/3.4.7...3.4.8)

---
updated-dependencies:
- dependency-name: test-unit
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-11 09:03:11 +00:00
Maikel
dcc8dc7ead Merge pull request #8318 from filipefurtad0/fix_flaky_checkout_auth_spec 
Fix flaky checkout auth spec
 2021-10-11 17:18:03 +11:00
Maikel Linke
35ed7e852d Remove errornous quotes from alert text 2021-10-11 16:43:14 +11:00
Maikel Linke
b008116734 Cover alert text in spec 
The `strip` method removes a trailing newline at the end.
 2021-10-11 16:41:52 +11:00
Matt-Yorkley
7ab4c40a0a Merge pull request #8317 from filipefurtad0/fix_flaky_authentication_spec 
Fix flaky consumer/authentication spec
 2021-10-10 18:20:20 +02:00
filipefurtad0
75f773fafc Updates/moves consumer/account/settings_spec into system 2021-10-08 14:36:54 +01:00
filipefurtad0
acc0cc08c3 Updates/moves consumer/account/payments_spec into system 2021-10-08 14:31:03 +01:00
filipefurtad0
97a79a77e1 Updates/moves consumer/account/cards_spec into system 2021-10-08 14:29:41 +01:00
filipefurtad0
0d87aea9f5 Updates and moves checkout_auth_spec into system 2021-10-08 14:05:38 +01:00
filipefurtad0
a376c0b079 Updates cookie manipulation syntax to be Ferrum compliant 2021-10-08 10:28:02 +01:00
filipefurtad0
8f777b4d38 Updates authentication_spec.rb into system spec 2021-10-08 10:26:14 +01:00
Jean-Baptiste Bellet
3d87485cd3 Move shopping_spec.rb as a system spec 
- Move the file to `spec/system/`
 - Replace `require 'spec_helper'` by `require 'system_helper'`
 - replace `feature` with `describe`
 2021-10-08 11:06:54 +02:00
Matt-Yorkley
86404045f2 Update all locales with the latest Transifex translations 2021-10-07 19:04:55 +01:00
Matt-Yorkley
10fe61b71f Merge pull request #8285 from openfoodfoundation/transifex 
Transifex
 2021-10-07 20:01:07 +02:00
Transifex-Openfoodnetwork
1adcd61c88 Updating translations for config/locales/fr.yml 2021-10-08 03:18:25 +11:00
Transifex-Openfoodnetwork
452f4ec0b8 Updating translations for config/locales/en_FR.yml 2021-10-08 03:16:20 +11:00
Transifex-Openfoodnetwork
09b9c8e10d Updating translations for config/locales/fr.yml 2021-10-08 03:15:23 +11:00
Andy Brett
e4be521632 Merge pull request #8203 from YasuhiroYoshida/adjust-visibility-of-enterprises-on-hub 
Change visibilities of hubs on group page
 2021-10-07 08:00:37 -07:00
Andy Brett
40e701abcc Merge pull request #8280 from sinansonmez/50-make-home-page-labels-clickable 
Make home page labels clickable
 2021-10-07 07:59:52 -07:00
Nihal M. Kelanthodika
d85a109a21 Merge pull request #7973 from apricot12/HQ_address_in_business_details 2021-10-07 18:32:24 +05:30
Matt-Yorkley
bb43d82306 Merge pull request #8300 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-controls-6.3.10 
Bump @storybook/addon-controls from 6.3.9 to 6.3.10
 2021-10-07 12:56:42 +02:00
Matt-Yorkley
f1b7e1b994 Merge pull request #8304 from openfoodfoundation/dependabot/npm_and_yarn/storybook/server-6.3.10 
Bump @storybook/server from 6.3.9 to 6.3.10
 2021-10-07 12:55:55 +02:00
dependabot[bot]
0ae87b2252 Bump @storybook/server from 6.3.9 to 6.3.10 
Bumps [@storybook/server](https://github.com/storybookjs/storybook/tree/HEAD/app/server) from 6.3.9 to 6.3.10.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.3.10/app/server)

---
updated-dependencies:
- dependency-name: "@storybook/server"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-07 10:53:50 +00:00
dependabot[bot]
0f081422ee Bump @storybook/addon-controls from 6.3.9 to 6.3.10 
Bumps [@storybook/addon-controls](https://github.com/storybookjs/storybook/tree/HEAD/addons/controls) from 6.3.9 to 6.3.10.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.3.10/addons/controls)

---
updated-dependencies:
- dependency-name: "@storybook/addon-controls"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-07 10:53:12 +00:00
Matt-Yorkley
ecac39b71f Merge pull request #8299 from openfoodfoundation/dependabot/bundler/bugsnag-6.24.0 
Bump bugsnag from 6.23.0 to 6.24.0
 2021-10-07 12:51:38 +02:00
Matt-Yorkley
aea07af23f Merge pull request #8298 from openfoodfoundation/dependabot/bundler/ddtrace-0.53.0 
Bump ddtrace from 0.52.0 to 0.53.0
 2021-10-07 12:51:25 +02:00
Matt-Yorkley
d44d6293d4 Merge pull request #8297 from openfoodfoundation/dependabot/bundler/rubocop-rails-2.12.3 
Bump rubocop-rails from 2.12.2 to 2.12.3
 2021-10-07 12:50:59 +02:00
Matt-Yorkley
a0bea5baa9 Merge pull request #8302 from openfoodfoundation/dependabot/npm_and_yarn/storybook/addon-docs-6.3.10 
Bump @storybook/addon-docs from 6.3.9 to 6.3.10
 2021-10-07 12:49:37 +02:00
Matt-Yorkley
58f7955c16 Merge pull request #8306 from openfoodfoundation/revert-8301-dependabot/npm_and_yarn/stimulus-3.0.1 
Revert "Bump stimulus from 2.0.0 to 3.0.1"
 2021-10-07 12:42:04 +02:00
Matt-Yorkley
200bf36604 Revert "Bump stimulus from 2.0.0 to 3.0.1" 2021-10-07 12:41:51 +02:00
Matt-Yorkley
4ecb646965 Merge pull request #8305 from openfoodfoundation/revert-8303-dependabot/npm_and_yarn/webpack-cli-4.9.0 
Revert "Bump webpack-cli from 3.3.12 to 4.9.0"
 2021-10-07 12:41:30 +02:00
Matt-Yorkley
9282d8e1e0 Revert "Bump webpack-cli from 3.3.12 to 4.9.0" 2021-10-07 12:41:14 +02:00
Matt-Yorkley
ba99824def Merge pull request #8301 from openfoodfoundation/dependabot/npm_and_yarn/stimulus-3.0.1 
Bump stimulus from 2.0.0 to 3.0.1
 2021-10-07 12:40:54 +02:00
Matt-Yorkley
87c679b7cc Merge pull request #8303 from openfoodfoundation/dependabot/npm_and_yarn/webpack-cli-4.9.0 
Bump webpack-cli from 3.3.12 to 4.9.0
 2021-10-07 12:39:08 +02:00
dependabot[bot]
832347a253 Bump webpack-cli from 3.3.12 to 4.9.0 
Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.3.12 to 4.9.0.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/v3.3.12...webpack-cli@4.9.0)

---
updated-dependencies:
- dependency-name: webpack-cli
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-07 09:06:54 +00:00
dependabot[bot]
9f1e1ee270 Bump @storybook/addon-docs from 6.3.9 to 6.3.10 
Bumps [@storybook/addon-docs](https://github.com/storybookjs/storybook/tree/HEAD/addons/docs) from 6.3.9 to 6.3.10.
- [Release notes](https://github.com/storybookjs/storybook/releases)
- [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md)
- [Commits](https://github.com/storybookjs/storybook/commits/v6.3.10/addons/docs)

---
updated-dependencies:
- dependency-name: "@storybook/addon-docs"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-10-07 09:06:21 +00:00