-
Notifications
You must be signed in to change notification settings - Fork 283
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into ts-yarn-scripts
* develop: Dutch translation (#590) FR locale update (#591) Fix incorrect intersect function import (#575) Add e2e test + screenshots for iPhone SE (#586) Translate platform (iOS, Android) strings (#578) Improve Google Location Data import experience (#410) Fix intersect to handle multiple authorities (#529) update italian localization (#576) [iOS] End to end tests w/ Detox (#567) Add a debug mode for intersections (#437) Romanian Translation (#545) Making COVID-19 consistent on all screens (#565) Update iOS splash text to "Safe Paths" (#562) Update android splash text to "Safe Paths" (#560)
- Loading branch information
Showing
95 changed files
with
3,344 additions
and
653 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| module.exports = { | ||
| root: true, | ||
| extends: [ | ||
| 'eslint:recommended', | ||
| 'plugin:react/recommended', | ||
| 'plugin:jest/recommended', | ||
| ], | ||
| parser: 'babel-eslint', | ||
| plugins: ['react', 'react-native', 'detox'], | ||
| parserOptions: { | ||
| ecmaVersion: 6, | ||
| sourceType: 'module', | ||
| ecmaFeatures: { | ||
| jsx: true, | ||
| modules: true, | ||
| }, | ||
| }, | ||
| env: { | ||
| commonjs: true, | ||
| es6: true, | ||
| 'react-native/react-native': true, | ||
| 'detox/detox': true, | ||
| node: true, | ||
| jest: true, | ||
| 'jest/globals': true, | ||
| mocha: true, | ||
| }, | ||
| settings: { | ||
| react: { | ||
| version: 'detect', | ||
| }, | ||
| }, | ||
| rules: { | ||
| // 0 is for off, 1 is for warning, 2 is for error | ||
| 'eol-last': 2, // Require file to end with single newline | ||
| 'no-constant-condition': 2, // Disallow use of constant expressions in conditions | ||
| 'no-dupe-keys': 2, // Disallow Duplicate Keys | ||
| 'no-empty': 2, // Disallow Empty Block Statements | ||
| 'no-extra-boolean-cast': 2, // Disallow Extra Boolean Casts | ||
| 'no-prototype-builtins': 2, // Disallow use of Object.prototypes builtins directly | ||
| 'no-undef': 2, // Disallow Undeclared Variables | ||
| 'no-underscore-dangle': 2, // Disallow dangling underscores in identifiers | ||
| 'no-unreachable': 2, // Disallow unreachable code after return, throw, continue, and break statements | ||
| 'no-unused-vars': 2, // Disallow Unused Variables | ||
| 'no-useless-escape': 2, // Disallow unnecessary escape usage | ||
| 'no-console': 0, // disallow the use of console | ||
| 'no-var': 2, // require let or const instead of var | ||
| strict: [2, 'global'], // require or disallow strict mode directives | ||
| 'react-native/no-color-literals': 1, // Detect StyleSheet rules and inline styles containing color literals instead of variables | ||
| 'react-native/no-inline-styles': 0, // For keeping styles away from the logic, we can switch it to 1 in future | ||
| 'react-native/no-raw-text': 1, // This is to make sure everything is translated in the app | ||
| 'react-native/no-unused-styles': 1, // Detect StyleSheet rules which are not used in your React components | ||
| 'react/jsx-boolean-value': 2, // Enforce boolean attributes notation in JSX (fixable) | ||
| 'react/jsx-key': 2, // Report missing key props in iterators/collection literals | ||
| 'react/jsx-no-duplicate-props': 2, // Enforce no duplicate props | ||
| 'react/jsx-no-undef': 2, // Disallow undeclared variables in JSX | ||
| 'react/jsx-sort-props': 0, // Enforce props alphabetical sorting (fixable) | ||
| 'react/jsx-wrap-multilines': 2, // Prevent missing parentheses around multilines JSX (fixable) | ||
| 'react/no-deprecated': 1, // Prevent usage of deprecated methods | ||
| 'react/no-did-mount-set-state': 1, // Prevent usage of setState in componentDidMount | ||
| 'react/no-did-update-set-state': 1, // Prevent usage of setState in componentDidUpdate | ||
| 'react/no-multi-comp': 0, // Prevent multiple component definition per file | ||
| 'react/no-string-refs': 1, // Prevent string definitions for references and prevent referencing this.refs | ||
| 'react/prop-types': 0, // Prevent missing props validation in a React component definition | ||
| 'react/react-in-jsx-scope': 2, // Prevent missing React when using JSX | ||
| 'react/self-closing-comp': 2, // Prevent extra closing tags for components without children | ||
| }, | ||
| }; |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -68,3 +68,9 @@ ios/Podfile.lock | |
|
|
||
| # Ruby gems | ||
| ios/vendor/bundle/* | ||
|
|
||
| # Screenshots | ||
| e2e/artifacts/* | ||
|
|
||
| # VSCode | ||
| .vscode/* | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| export default { | ||
| pick: jest.fn(), | ||
| pickMultiple: jest.fn(), | ||
| isCancel: jest.fn(), | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
24 changes: 24 additions & 0 deletions
24
android/app/src/androidTest/org/pathcheck/covidsafepaths/DetoxTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| package org.pathcheck.covidsafepaths; | ||
|
|
||
| import com.wix.detox.Detox; | ||
|
|
||
| import org.junit.Rule; | ||
| import org.junit.Test; | ||
| import org.junit.runner.RunWith; | ||
|
|
||
| import androidx.test.ext.junit.runners.AndroidJUnit4; | ||
| import androidx.test.filters.LargeTest; | ||
| import androidx.test.rule.ActivityTestRule; | ||
|
|
||
| @RunWith(AndroidJUnit4.class) | ||
| @LargeTest | ||
| public class DetoxTest { | ||
|
|
||
| @Rule | ||
| public ActivityTestRule<MainActivity> mActivityRule = new ActivityTestRule<>(MainActivity.class, false, false); | ||
|
|
||
| @Test | ||
| public void runDetoxTests() { | ||
| Detox.runTests(mActivityRule); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.