scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-28 01:56:00 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #4138 from LLK/develop

Browse source 
merge from develop to release branch
This commit is contained in:
Eric Rosenbaum 2020-06-24 09:30:12 -04:00 committed by GitHub
commit 46b1872aee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 709 additions and 701 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1381
package-lock.json generated
View file

File diff suppressed because it is too large Load diff

2
package.json
View file

@ -128,7 +128,7 @@
"redux-mock-store": "^1.2.3",
"redux-thunk": "2.0.1",
"sass-loader": "6.0.6",
"scratch-gui": "0.1.0-prerelease.20200618175748",
"scratch-gui": "0.1.0-prerelease.20200622200348",
"scratch-l10n": "latest",
"selenium-webdriver": "3.6.0",
"slick-carousel": "1.6.0",

4
src/components/registration/steps.jsx
View file

@ -456,7 +456,7 @@ class DemographicsStep extends React.Component {
// look up country name using user's country code selection ('us' -> 'United States')
getCountryName (values) {
if (values.countryCode) {
const countryInfo = countryData.lookupCountryInfo(values.countryCode);
const countryInfo = countryData.lookupCountryByCode(values.countryCode);
if (countryInfo) {
return countryInfo.name;
}
@ -466,7 +466,7 @@ class DemographicsStep extends React.Component {
// look up country code from country label ('United States' -> 'us')
// if `countryName` is not found, including if it's null or undefined, then this function will return undefined.
getCountryCode (countryName) {
const country = countryData.countryInfo.find(countryItem => countryItem.name === countryName);
const country = countryData.lookupCountryByName(countryName);
return country && country.code;
}
handleValidSubmit (formData) {

6
src/lib/country-data.js
View file

@ -1036,10 +1036,14 @@ const countryOptions = module.exports.countryOptions = (startingCountryInfo, val
))
);
module.exports.lookupCountryInfo = countryCode => (
module.exports.lookupCountryByCode = countryCode => (
countryInfo.find(country => country.code === countryCode)
);
module.exports.lookupCountryByName = countryName => (
countryInfo.find(country => country.name === countryName)
);
/**
* Function dupeCommonCountries():
* takes startingCountryInfo, and duplicates any number of its country labels

17
test/unit/lib/country-data.test.js
View file

@ -1,7 +1,8 @@
const {
countryInfo,
countryOptions,
lookupCountryInfo,
lookupCountryByCode,
lookupCountryByName,
dupeCommonCountries,
registrationCountryCodeOptions,
registrationCountryNameOptions,
@ -45,9 +46,17 @@ describe('unit test lib/country-data.js', () => {
expect(szInfo.label).toEqual('Eswatini');
});
test('lookupCountryInfo() will find country info', () => {
expect(typeof lookupCountryInfo).toBe('function');
const eswatiniInfo = lookupCountryInfo('sz');
test('lookupCountryByCode() will find country info', () => {
expect(typeof lookupCountryByCode).toBe('function');
const eswatiniInfo = lookupCountryByCode('sz');
expect(eswatiniInfo.name).toEqual('Swaziland');
expect(eswatiniInfo.display).toEqual('Eswatini');
expect(eswatiniInfo.code).toEqual('sz');
});
test('lookupCountryByName() will find country info', () => {
expect(typeof lookupCountryByName).toBe('function');
const eswatiniInfo = lookupCountryByName('Swaziland');
expect(eswatiniInfo.name).toEqual('Swaziland');
expect(eswatiniInfo.display).toEqual('Eswatini');
expect(eswatiniInfo.code).toEqual('sz');