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

Jump to bottom

Merge 4.0.0 branch into master #48

Merged
merged 33 commits into from
Nov 30, 2016
Merged

Merge 4.0.0 branch into master #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
7a2b27e
Use fbsimcmd installed from brew, rather than bring it as a dependenc…
LeoNatan Oct 12, 2016
510045b
Use EarlGrey and SocketRocket as sub-modules. Update EarlGrey to the …
LeoNatan Oct 12, 2016
ac4eb9f
Update to latest React & React Native in test project.
LeoNatan Oct 12, 2016
658a157
Support modern RN reloadRequest method, if available, else fallback t…
LeoNatan Oct 13, 2016
cb419e6
Move each action to its own script, set `test` script to use other sc…
LeoNatan Oct 13, 2016
3277efc
Scripts overhaul
LeoNatan Oct 14, 2016
a798f04
Add new idling resources for dispatch queue, JS display link, JS runl…
LeoNatan Oct 18, 2016
f81daed
Update tests to work with new Detox.
LeoNatan Oct 18, 2016
281c7b8
Add native timeout.
LeoNatan Oct 19, 2016
c543cbf
Remove unneeded imports from public header file.
LeoNatan Oct 25, 2016
6b7be12
Make Detox scheme shared
LeoNatan Oct 25, 2016
d6552de
Fix symbolic links in SocketRocket after npm install, causing compile…
LeoNatan Oct 26, 2016
351d828
Add detox deployment script for Xcode projects
LeoNatan Nov 4, 2016
9804005
Script fixes
LeoNatan Nov 10, 2016
9dcdba2
Upgrade EarlGrey with improved scrolling performance.
LeoNatan Nov 10, 2016
6905745
moved fbsimctl to postinstall
rotemmiz Nov 27, 2016
323bb86
bump major
rotemmiz Nov 27, 2016
59099fe
Update deploy script to use correct path.
LeoNatan Nov 27, 2016
744ab05
Merge branch 'improve_tooling' of github.com:wix/detox into improve_t…
rotemmiz Nov 27, 2016
a44aac2
Update postinstall.js
LeoNatan Nov 27, 2016
c08753a
Merge branch 'improve_tooling' of github.com:wix/detox into improve_t…
rotemmiz Nov 27, 2016
096a9f9
bump
rotemmiz Nov 27, 2016
c41678a
Update postinstall.js
LeoNatan Nov 30, 2016
affdb80
version ++
LeoNatan Nov 30, 2016
1c195c0
Use bash script to remove shelljs dependency.
LeoNatan Nov 30, 2016
3951014
Version ++
LeoNatan Nov 30, 2016
7743a8d
Use iOS 10.1 in test.
LeoNatan Nov 30, 2016
017e7fc
Fix Detox logic
LeoNatan Nov 30, 2016
994af2a
major version 4
DanielZlotin Nov 30, 2016
8a0d82b
Improve npm deployment
LeoNatan Nov 30, 2016
7713189
Ignore dirty submodules
LeoNatan Nov 30, 2016
bd416ce
Version ++
LeoNatan Nov 30, 2016
346c268
Merge master branch
LeoNatan Nov 30, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,3 +209,4 @@ buck-out/
\.buckd/
android/app/libs
android/keystores/debug.keystore
ios.tar
16 changes: 16 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
[submodule "detox/ios/SocketRocket"]
path = detox/ios/SocketRocket
url = https://github.com/facebook/SocketRocket.git
ignore = dirty
[submodule "detox/ios/EarlGrey"]
path = detox/ios/EarlGrey
url = https://github.com/google/EarlGrey.git
ignore = dirty
[submodule "detox/scripts/Xcodeproj"]
path = detox/scripts/Xcodeproj
url = https://github.com/CocoaPods/Xcodeproj.git
ignore = dirty
[submodule "detox/scripts/Nanaimo"]
path = detox/scripts/Nanaimo
url = https://github.com/CocoaPods/Nanaimo.git
ignore = dirty
211 changes: 0 additions & 211 deletions detox-tools/.gitignore
View file
Open in desktop

This file was deleted.

Loading