Skip to content

Commit

Permalink
Merge pull request RocketChat#2 from Milchjugend/single-serve-4.7.0
Browse files Browse the repository at this point in the history
1.2 Navigation Updates & Upgrade to RN 4.7.0
  • Loading branch information
Peter Müller authored Jul 28, 2020
2 parents 51047f9 + 2c6106f commit d1965f5
Show file tree
Hide file tree
Showing 3,795 changed files with 368,717 additions and 71,622 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
367 changes: 179 additions & 188 deletions .circleci/config.yml

Large diffs are not rendered by default.

19 changes: 18 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ module.exports = {
"no-regex-spaces": 2,
"no-undef": 2,
"no-unreachable": 2,
"no-unused-expressions": 0,
"no-unused-vars": [2, {
"vars": "all",
"args": "after-used"
Expand Down Expand Up @@ -131,7 +132,23 @@ module.exports = {
"react-native/no-unused-styles": 2,
"react/jsx-one-expression-per-line": 0,
"require-await": 2,
"func-names": 0
"func-names": 0,
"react/sort-comp": ["error", {
"order": [
"static-variables",
"static-methods",
"lifecycle",
"everything-else",
"render"
]
}],
"react/static-property-placement": [0],
"arrow-parens": ["error", "as-needed", { requireForBlockBody: true }],
"react/jsx-props-no-spreading": [1],
"react/jsx-curly-newline": [0],
"react/state-in-constructor": [0],
"no-async-promise-executor": [0],
"max-classes-per-file": [0]
},
"globals": {
"__DEV__": true
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ coverage/
buck-out/
\.buckd/
*.keystore
*.jks

# fastlane
#
Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -208,13 +208,15 @@ Readme will guide you on how to config.
- Build your app
```bash
$ detox build --configuration ios.sim.release
$ npx detox build --configuration ios.sim.release
```
- Run tests
```bash
$ detox test --configuration ios.sim.release
$ npx detox test ./e2e/tests/onboarding --configuration ios.sim.release
$ npx detox test ./e2e/tests/room --configuration ios.sim.release
$ npx detox test ./e2e/tests/assorted --configuration ios.sim.release
```
## Storybook
Expand Down
14 changes: 14 additions & 0 deletions __mocks__/expo-av.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
export class Sound {
loadAsync = () => {};

playAsync = () => {};

pauseAsync = () => {};

stopAsync = () => {};

setOnPlaybackStatusUpdate = () => {};

setPositionAsync = () => {};
}
export const Audio = { Sound };
4 changes: 4 additions & 0 deletions __mocks__/expo-keep-awake.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export default {
activateKeepAwake: () => '',
deactivateKeepAwake: () => ''
};
3 changes: 2 additions & 1 deletion __mocks__/react-native-device-info.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@ export default {
getModel: () => '',
getReadableVersion: () => '',
getBundleId: () => '',
isTablet: () => false
isTablet: () => false,
hasNotch: () => false
};
Loading

0 comments on commit d1965f5

Please sign in to comment.