From 8be3e972fc866e66580ab3199bac7d62fea67d11 Mon Sep 17 00:00:00 2001 From: Salakar Date: Wed, 22 May 2019 01:10:18 +0100 Subject: [PATCH] misc changes - ignore [skip ci] --- ...baseMLNaturalLanguageSmartReplyModule.java | 2 +- tests/android/app/build.gradle | 7 +- tests/e2e/init.js | 34 +++++----- tests/e2e/mocha.opts | 2 +- tests/index.android.js | 2 +- tests/type-test.ts | 65 +++++++++---------- yarn.lock | 8 +++ 7 files changed, 61 insertions(+), 59 deletions(-) diff --git a/packages/ml-natural-language/android/src/main/java/io/invertase/firebase/ml/naturallanguage/UniversalFirebaseMLNaturalLanguageSmartReplyModule.java b/packages/ml-natural-language/android/src/main/java/io/invertase/firebase/ml/naturallanguage/UniversalFirebaseMLNaturalLanguageSmartReplyModule.java index 95831b7f62..2701a615d5 100644 --- a/packages/ml-natural-language/android/src/main/java/io/invertase/firebase/ml/naturallanguage/UniversalFirebaseMLNaturalLanguageSmartReplyModule.java +++ b/packages/ml-natural-language/android/src/main/java/io/invertase/firebase/ml/naturallanguage/UniversalFirebaseMLNaturalLanguageSmartReplyModule.java @@ -39,7 +39,7 @@ class UniversalFirebaseMLNaturalLanguageSmartReplyModule extends UniversalFireba @Override public void onTearDown() { super.onTearDown(); - UniversalFirebaseMLNaturalLanguageSmartReplyConversation.destroyAllConversations(); +// UniversalFirebaseMLNaturalLanguageSmartReplyConversation.destroyAllConversations(); } /** diff --git a/tests/android/app/build.gradle b/tests/android/app/build.gradle index 4331963ca3..0dfc443000 100755 --- a/tests/android/app/build.gradle +++ b/tests/android/app/build.gradle @@ -120,26 +120,23 @@ android { } dependencies { - implementation fileTree(dir: "libs", include: ["*.jar"]) + implementation fileTree(include: ['*.jar'], dir: 'libs') //noinspection GradleDynamicVersion - implementation "com.facebook.react:react-native:+" + implementation 'com.facebook.react:react-native:+' //noinspection GradleDynamicVersion implementation 'org.webkit:android-jsc:+' /* ---------------------------- * REACT NATIVE FIREBASE * ---------------------------- */ - firebasePackages.each { firebasePackage -> implementation project(path: ":@react-native-firebase_${firebasePackage}") } - /* ------------------------ * TESTING SDKS/LIBRARIES * ------------------------ */ implementation(project(path: ':jet')) { transitive = false } - androidTestImplementation('com.wix:detox:+') { transitive = true } androidTestImplementation 'junit:junit:4.12' } diff --git a/tests/e2e/init.js b/tests/e2e/init.js index 42645c73fd..e814db9165 100755 --- a/tests/e2e/init.js +++ b/tests/e2e/init.js @@ -26,24 +26,24 @@ const { requirePackageTests } = require('./helpers'); const { detox: config } = require('../package.json'); const PACKAGES = [ - // 'app', - // 'iid', - // 'perf', - // 'fiam', - // 'functions', - // 'analytics', - // 'config', - // 'crashlytics', - // 'utils', + 'app', + 'iid', + 'perf', + 'fiam', + 'functions', + 'analytics', + 'config', + 'crashlytics', + 'utils', // 'mlkit', - 'ml-natural-language', - // 'invites', - // 'fiam', - // 'auth', - // // 'firestore', - // 'links', - // // 'messaging', - // 'storage', + // 'ml-natural-language', + 'invites', + 'fiam', + 'auth', + // 'firestore', + 'links', + // 'messaging', + 'storage', ]; for (let i = 0; i < PACKAGES.length; i++) { diff --git a/tests/e2e/mocha.opts b/tests/e2e/mocha.opts index 525f4e730c..e943165954 100755 --- a/tests/e2e/mocha.opts +++ b/tests/e2e/mocha.opts @@ -2,7 +2,7 @@ --timeout 260000 --reporter spec --slow 2000 ---retries 0 +--retries 2 --bail --exit --require node_modules/jet/platform/node diff --git a/tests/index.android.js b/tests/index.android.js index 0fdfad5415..4cd59214a2 100644 --- a/tests/index.android.js +++ b/tests/index.android.js @@ -1 +1 @@ -require('./app.smartreply'); +require('./app'); diff --git a/tests/type-test.ts b/tests/type-test.ts index 9596762708..ba901742fc 100644 --- a/tests/type-test.ts +++ b/tests/type-test.ts @@ -2,37 +2,34 @@ import '@react-native-firebase/storage'; import '@react-native-firebase/perf'; import '@react-native-firebase/functions'; -import { firebase } from '@react-native-firebase/analytics'; - -const foo = async () => { - const task = firebase - .app() - .storage('gs://foo') - .ref('foo') - .putFile(''); - - task.finally - - task.on(firebase.storage.TaskEvent.STATE_CHANGED, taskSnapshot => { - if (taskSnapshot.state === firebase.storage.TaskState.) { - console.log('cancelling task!'); - taskSnapshot.task.cancel(); - } - }); - - task.catch(e => { - return 'bar'; - }); - - task.then(snapshot => { - snapshot.metadata.bucket; - return 'foo'; - }); - - firebase.storage.TaskState.CANCELLED; - firebase.storage.TaskEvent.STATE_CHANGED; - firebase.perf().newHttpMetric('', 'GET'); - // firebase.functions.HttpsErrorCode.ABORTED; -}; - -foo(); +// +// const foo = async () => { +// const task = firebase +// .app() +// .storage('gs://foo') +// .ref('foo') +// .putFile(''); +// +// task.on(firebase.storage.TaskEvent.STATE_CHANGED, taskSnapshot => { +// if (taskSnapshot.state === firebase.storage.TaskState.) { +// console.log('cancelling task!'); +// taskSnapshot.task.cancel(); +// } +// }); +// +// task.catch(e => { +// return 'bar'; +// }); +// +// task.then(snapshot => { +// snapshot.metadata.bucket; +// return 'foo'; +// }); +// +// firebase.storage.TaskState.CANCELLED; +// firebase.storage.TaskEvent.STATE_CHANGED; +// firebase.perf().newHttpMetric('', 'GET'); +// // firebase.functions.HttpsErrorCode.ABORTED; +// }; +// +// foo(); diff --git a/yarn.lock b/yarn.lock index 06002ed87a..1ae19485bb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1549,6 +1549,14 @@ xcode "^2.0.0" xmldoc "^0.4.0" +"@react-native-firebase/mlkit@6.0.0-alpha.22": + version "6.0.0-alpha.22" + resolved "https://registry.yarnpkg.com/@react-native-firebase/mlkit/-/mlkit-6.0.0-alpha.22.tgz#20fb3dd29225b131a68b469b81aade12d55cf2cd" + integrity sha512-MRUFkWAMF5XQBwpBsYFz4nGJWkSU/PJ9i3FJkSt1+vGHjY2Q10ukEzTnveQSevjZGc8J0oUyFUVB1dsk/XHxqA== + dependencies: + "@react-native-firebase/app-types" "6.0.0-alpha.22" + "@react-native-firebase/common" "6.0.0-alpha.22" + "@react-native-firebase/private-tests-firebase-functions@^0.0.1": version "0.0.1" resolved "https://registry.yarnpkg.com/@react-native-firebase/private-tests-firebase-functions/-/private-tests-firebase-functions-0.0.1.tgz#bbee243641e92a3d50925cb95e95dbcd28f7fc27"