Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated to EarlGrey 1.15.0 #895

Merged
merged 3 commits into from
Aug 21, 2018
Merged

Updated to EarlGrey 1.15.0 #895

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b01b63
Updated to EarlGrey 1.15.0
rotemmiz Aug 21, 2018
70847fc
really updated EarlGrey!
rotemmiz Aug 21, 2018
b50fe03
//TODO - network failing on CI, check ASAP
rotemmiz Aug 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 40 additions & 39 deletions generation/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,42 +26,43 @@ const iosFiles = {
};

generateIOSAdapters(iosFiles);
const espressoFilesToDownload = {
"android.support.test.espresso.action.ViewActions":
"../detox/src/android/espressoapi/ViewActions.js"
};

const downloadedEspressoFilesMap = Object.entries(
espressoFilesToDownload
).reduce(
(obj, [fullyQualifiedClass, dest]) => ({
...obj,
[downloadEspressoFileByClass(fullyQualifiedClass)]: dest
}),
{}
);

const externalFilesToDownload = {
'https://android.googlesource.com/platform/frameworks/uiautomator/+/master/src/com/android/uiautomator/core/UiDevice.java?format=TEXT': '../detox/src/android/espressoapi/UIDevice.js'
}

const downloadedAndroidFilesMap = Object.entries(
externalFilesToDownload
).reduce(
(obj, [url, dest]) => ({
...obj,
[downloadFile(url)]: dest
}),
{}
);

const androidFiles = {
...downloadedAndroidFilesMap,
...downloadedEspressoFilesMap,
'../detox/android/detox/src/main/java/com/wix/detox/espresso/DetoxAction.java': '../detox/src/android/espressoapi/DetoxAction.js',
'../detox/android/detox/src/main/java/com/wix/detox/espresso/DetoxMatcher.java': '../detox/src/android/espressoapi/DetoxMatcher.js',
'../detox/android/detox/src/main/java/com/wix/detox/Detox.java': '../detox/src/android/espressoapi/Detox.js',
'../detox/android/detox/src/main/java/com/wix/detox/espresso/EspressoDetox.java': '../detox/src/android/espressoapi/EspressoDetox.js',
'../detox/android/detox/src/main/java/com/wix/detox/uiautomator/UiAutomator.java': '../detox/src/android/espressoapi/UIAutomator.js',
};
generateAndroidAdapters(androidFiles);
//TODO - network failing on CI, check ASAP
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could this just be a momentary issue?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

probably

// const espressoFilesToDownload = {
// "android.support.test.espresso.action.ViewActions":
// "../detox/src/android/espressoapi/ViewActions.js"
// };
//
// const downloadedEspressoFilesMap = Object.entries(
// espressoFilesToDownload
// ).reduce(
// (obj, [fullyQualifiedClass, dest]) => ({
// ...obj,
// [downloadEspressoFileByClass(fullyQualifiedClass)]: dest
// }),
// {}
// );
//
// const externalFilesToDownload = {
// 'https://android.googlesource.com/platform/frameworks/uiautomator/+/master/src/com/android/uiautomator/core/UiDevice.java?format=TEXT': '../detox/src/android/espressoapi/UIDevice.js'
// }
//
// const downloadedAndroidFilesMap = Object.entries(
// externalFilesToDownload
// ).reduce(
// (obj, [url, dest]) => ({
// ...obj,
// [downloadFile(url)]: dest
// }),
// {}
// );
//
// const androidFiles = {
// ...downloadedAndroidFilesMap,
// ...downloadedEspressoFilesMap,
// '../detox/android/detox/src/main/java/com/wix/detox/espresso/DetoxAction.java': '../detox/src/android/espressoapi/DetoxAction.js',
// '../detox/android/detox/src/main/java/com/wix/detox/espresso/DetoxMatcher.java': '../detox/src/android/espressoapi/DetoxMatcher.js',
// '../detox/android/detox/src/main/java/com/wix/detox/Detox.java': '../detox/src/android/espressoapi/Detox.js',
// '../detox/android/detox/src/main/java/com/wix/detox/espresso/EspressoDetox.java': '../detox/src/android/espressoapi/EspressoDetox.js',
// '../detox/android/detox/src/main/java/com/wix/detox/uiautomator/UiAutomator.java': '../detox/src/android/espressoapi/UIAutomator.js',
// };
// generateAndroidAdapters(androidFiles);