Skip to content

Commit

Permalink
[FCE-478] Rename mobile test app (#95)
Browse files Browse the repository at this point in the history
## Description

Renamed example app from `video-chat` to to `fishjam-chat`

## Motivation and Context

Use the same name for the example as in the
[web-client-sdk](https://github.com/fishjam-cloud/web-client-sdk)

## How has this been tested?

- Built and run both Android and iOS
- Run e2e tests. Tests failed locally, but built and run successfully.
Created new [issue to
fix](https://linear.app/swmansion/issue/FCE-481/fix-local-e2e-example-tests)

## Types of changes

- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing
functionality to
      not work as expected)

## Checklist:

- [ ] My code follows the code style of this project.
- [x] My change requires a change to the documentation.
- [x] I have updated the documentation accordingly.
  • Loading branch information
MiloszFilimowski authored Sep 6, 2024
1 parent 1fbbbd0 commit 07770ea
Show file tree
Hide file tree
Showing 128 changed files with 83 additions and 85 deletions.
42 changes: 21 additions & 21 deletions .github/actions/restore_apk_file/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,26 +18,26 @@ runs:
path: ${{ env.ANDROID_APP_PATH }}
key: |
APK-${{ hashFiles(
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/video-chat/assets/**/*',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/video-chat/components/**/*',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/video-chat/contexts/**/*',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/video-chat/hooks/**/*',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/video-chat/navigators/**/*',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/video-chat/providers/**/*',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/video-chat/screens/**/*',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/video-chat/types/**/*',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/video-chat/utils/**/*',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/video-chat/App.tsx',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/video-chat/yarn.lock',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/fishjam-chat/assets/**/*',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/fishjam-chat/components/**/*',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/fishjam-chat/contexts/**/*',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/fishjam-chat/hooks/**/*',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/fishjam-chat/navigators/**/*',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/fishjam-chat/providers/**/*',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/fishjam-chat/screens/**/*',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/fishjam-chat/types/**/*',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/fishjam-chat/utils/**/*',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/fishjam-chat/App.tsx',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/fishjam-chat/yarn.lock',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/yarn.lock',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/video-chat/android/app/src/**/*',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/video-chat/android/app/build.gradle',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/video-chat/android/app/debug.keystore',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/video-chat/android/app/proguard-rules.pro',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/video-chat/android/gradle/**/*',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/video-chat/android/build.gradle',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/video-chat/android/gradle.properties',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/video-chat/android/gradlew',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/video-chat/android/gradle.bat',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/video-chat/android/settings.gradle'
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/fishjam-chat/android/app/src/**/*',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/fishjam-chat/android/app/build.gradle',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/fishjam-chat/android/app/debug.keystore',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/fishjam-chat/android/app/proguard-rules.pro',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/fishjam-chat/android/gradle/**/*',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/fishjam-chat/android/build.gradle',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/fishjam-chat/android/gradle.properties',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/fishjam-chat/android/gradlew',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/fishjam-chat/android/gradle.bat',
'/home/runner/work/mobile-client-sdk/mobile-client-sdk/examples/fishjam-chat/android/settings.gradle'
) }}
4 changes: 2 additions & 2 deletions .github/workflows/react_native_e2e_android.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
BUILD_TOOL: "build-tools;33.0.0"
ANDROID_CMD: "commandlinetools-linux-10406996_latest.zip"
ANDROID_APP_PATH: ${{ github.workspace
}}/examples/video-chat/android/app/build/outputs/apk/release/app-release.apk
}}/examples/fishjam-chat/android/app/build/outputs/apk/release/app-release.apk

steps:
- name: Checkout
Expand Down Expand Up @@ -151,7 +151,7 @@ jobs:
if: steps.restore-apk.outputs.cache-hit != 'true'
timeout-minutes: 20
run: |
cd $GITHUB_WORKSPACE/examples/video-chat/android
cd $GITHUB_WORKSPACE/examples/fishjam-chat/android
./gradlew assembleRelease
- name: Cache new apk if necessary
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ To edit the Swift files, open `example/ios/MembraneExample.xcworkspace` in XCode
and find the source files at
`Pods > Development Pods > mobile-client-sdk`.

To edit the Kotlin files, open `examples/video-chat/android` in Android studio and find the
To edit the Kotlin files, open `examples/fishjam-chat/android` in Android studio and find the
source files at `reactnativemembrane` under `Android`.

### Commit message convention
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "video-chat-example",
"name": "@fishjam-example/fishjam-chat",
"version": "0.0.1",
"private": true,
"license": "Apache-2.0",
Expand Down
File renamed without changes.
8 changes: 8 additions & 0 deletions examples/fishjam-chat/scripts/lint.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/bash
set -e

echo "Running eslint for fishjam-chat javascript files \n"
eslint . --ext .ts,.tsx --fix --max-warnings 0

echo "Running prettier for fishjam-chat javascript files \n"
prettier --write . --ignore-path ./.eslintignore
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
8 changes: 0 additions & 8 deletions examples/video-chat/scripts/lint.sh

This file was deleted.

2 changes: 1 addition & 1 deletion examples/webdriverio-test/.env.example
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FISHJAM_HOST_SERVER =<ip address>:<port number>
FISHJAM_HOST_MOBILE =<ip address>:<port number>
ANDROID_DEVICE_NAME=Phone name
ANDROID_APP_PATH=path/to/your/repo/examples/video-chat/android/app/build/outputs/apk/release/app-release.apk
ANDROID_APP_PATH=path/to/your/repo/examples/fishjam-chat/android/app/build/outputs/apk/release/app-release.apk

IOS_FISHJAM_TOKEN=Token_for_ios_generated_from_fishjam_dashboard
IOS_DEVICE_ID=123123123
Expand Down
2 changes: 1 addition & 1 deletion examples/webdriverio-test/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
- ANDROID_APP_PATH - Path to .apk file on your computer, to generate it:

- In folder example run: cd android && ./gradlew assembleRelease
- Yor path should look like this your/path/to/repo/examples/video-chat/android/app/build/outputs/apk/release/app-release.apk
- Yor path should look like this your/path/to/repo/examples/fishjam-chat/android/app/build/outputs/apk/release/app-release.apk

- IOS_DEVICE_ID - id of your ios device, can be obtained using: xcrun xctrace list devices
- IOS_TEAM_ID - id of your team, can be obtained at apple developer page
Expand Down
2 changes: 1 addition & 1 deletion examples/webdriverio-test/test/specs/test.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
previewScreenLabels,
soundOutputDevicesLabels,
appNavigationLabels,
} from 'video-chat-example/types/ComponentLabels';
} from '@fishjam-example/fishjam-chat/types/ComponentLabels';

import {
getElement,
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"packages/react-native-client",
"packages/android-client",
"packages/ios-client",
"examples/video-chat",
"examples/fishjam-chat",
"examples/webdriverio-test"
]
},
Expand Down
2 changes: 0 additions & 2 deletions packages/react-native-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
"prepublishOnly": "expo-module prepublishOnly",
"expo-module": "expo-module",
"release": "release-it",
"releaseAppAndroid": "cd examples/video-chat/android && fastlane deploy",
"releaseAppIos": "cd example/ios && fastlane deploy",
"docs": "sed 's/\\.github\\/images/media/g' README.md > README_docs.md && typedoc src/index.tsx --media ./.github/images --readme README_docs.md && rm README_docs.md",
"typecheck": "yarn tsc --noEmit && cd example && yarn tsc --noEmit"
},
Expand Down
92 changes: 46 additions & 46 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3296,6 +3296,52 @@ __metadata:
languageName: unknown
linkType: soft

"@fishjam-example/fishjam-chat@workspace:examples/fishjam-chat":
version: 0.0.0-use.local
resolution: "@fishjam-example/fishjam-chat@workspace:examples/fishjam-chat"
dependencies:
"@babel/core": "npm:^7.25.2"
"@babel/preset-env": "npm:^7.25.4"
"@babel/runtime": "npm:^7.25.6"
"@expo-google-fonts/noto-sans": "npm:^0.2.3"
"@fishjam-cloud/react-native-client": "npm:*"
"@gorhom/bottom-sheet": "npm:^4"
"@notifee/react-native": "npm:^7.8.2"
"@react-native/babel-preset": "npm:0.75.2"
"@react-native/eslint-config": "npm:0.75.2"
"@react-native/metro-config": "npm:0.75.2"
"@react-native/typescript-config": "npm:0.75.2"
"@react-navigation/bottom-tabs": "npm:^6.6.1"
"@react-navigation/native": "npm:^6.1.18"
"@react-navigation/native-stack": "npm:^6.11.0"
"@tsconfig/react-native": "npm:^3.0.0"
"@types/jest": "npm:^29.5.12"
"@types/lodash": "npm:^4.17.7"
"@types/node": "npm:^22.5.4"
"@types/react": "npm:^18.3.5"
"@types/react-test-renderer": "npm:^18.0.0"
babel-jest: "npm:^29.6.3"
babel-plugin-module-resolver: "npm:^5.0.0"
expo: "npm:^50.0.20"
expo-camera: "npm:^14.0.4"
expo-device: "npm:^5.9.3"
expo-font: "npm:^11.10.2"
jest: "npm:^29.6.3"
lint-staged: "npm:^15.2.10"
react: "npm:18.3.1"
react-native: "npm:0.73.4"
react-native-dotenv: "npm:^3.4.8"
react-native-gesture-handler: "npm:~2.19.0"
react-native-reanimated: "npm:^3.15.1"
react-native-safe-area-context: "npm:4.10.9"
react-native-screens: "npm:^3.34.0"
react-native-toast-message: "npm:^2.2.0"
react-test-renderer: "npm:18.3.1"
ts-node: "npm:^10.9.1"
typescript: "npm:^5.5.4"
languageName: unknown
linkType: soft

"@gar/promisify@npm:^1.0.1":
version: 1.1.3
resolution: "@gar/promisify@npm:1.1.3"
Expand Down Expand Up @@ -20648,52 +20694,6 @@ __metadata:
languageName: node
linkType: hard

"video-chat-example@workspace:examples/video-chat":
version: 0.0.0-use.local
resolution: "video-chat-example@workspace:examples/video-chat"
dependencies:
"@babel/core": "npm:^7.25.2"
"@babel/preset-env": "npm:^7.25.4"
"@babel/runtime": "npm:^7.25.6"
"@expo-google-fonts/noto-sans": "npm:^0.2.3"
"@fishjam-cloud/react-native-client": "npm:*"
"@gorhom/bottom-sheet": "npm:^4"
"@notifee/react-native": "npm:^7.8.2"
"@react-native/babel-preset": "npm:0.75.2"
"@react-native/eslint-config": "npm:0.75.2"
"@react-native/metro-config": "npm:0.75.2"
"@react-native/typescript-config": "npm:0.75.2"
"@react-navigation/bottom-tabs": "npm:^6.6.1"
"@react-navigation/native": "npm:^6.1.18"
"@react-navigation/native-stack": "npm:^6.11.0"
"@tsconfig/react-native": "npm:^3.0.0"
"@types/jest": "npm:^29.5.12"
"@types/lodash": "npm:^4.17.7"
"@types/node": "npm:^22.5.4"
"@types/react": "npm:^18.3.5"
"@types/react-test-renderer": "npm:^18.0.0"
babel-jest: "npm:^29.6.3"
babel-plugin-module-resolver: "npm:^5.0.0"
expo: "npm:^50.0.20"
expo-camera: "npm:^14.0.4"
expo-device: "npm:^5.9.3"
expo-font: "npm:^11.10.2"
jest: "npm:^29.6.3"
lint-staged: "npm:^15.2.10"
react: "npm:18.3.1"
react-native: "npm:0.73.4"
react-native-dotenv: "npm:^3.4.8"
react-native-gesture-handler: "npm:~2.19.0"
react-native-reanimated: "npm:^3.15.1"
react-native-safe-area-context: "npm:4.10.9"
react-native-screens: "npm:^3.34.0"
react-native-toast-message: "npm:^2.2.0"
react-test-renderer: "npm:18.3.1"
ts-node: "npm:^10.9.1"
typescript: "npm:^5.5.4"
languageName: unknown
linkType: soft

"vlq@npm:^1.0.0":
version: 1.0.1
resolution: "vlq@npm:1.0.1"
Expand Down

0 comments on commit 07770ea

Please sign in to comment.