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

merged 33 commits into from
Nov 30, 2016

Commits on Oct 12, 2016

  1. Use fbsimcmd installed from brew, rather than bring it as a dependenc… 

    …y. `npm run test-install` will install from brew. If brew is not installed, the command will fail.
    @LeoNatan
    LeoNatan committed Oct 12, 2016
    Configuration menu
    Copy the full SHA
    7a2b27e View commit details
    Browse the repository at this point in the history

  2. Use EarlGrey and SocketRocket as sub-modules. Update EarlGrey to the … 

    …latest release version. Update detox code using EarlGrey.
    @LeoNatan
    LeoNatan committed Oct 12, 2016
    Configuration menu
    Copy the full SHA
    510045b View commit details
    Browse the repository at this point in the history

  3. Update to latest React & React Native in test project.

    @LeoNatan
    LeoNatan committed Oct 12, 2016
    Configuration menu
    Copy the full SHA
    ac4eb9f View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2016

  1. Support modern RN reloadRequest method, if available, else fallback t… 

    …o old way of reloading.
    @LeoNatan
    LeoNatan committed Oct 13, 2016
    Configuration menu
    Copy the full SHA
    658a157 View commit details
    Browse the repository at this point in the history

  2. Move each action to its own script, set test script to use other sc… 

    …ripts.
    @LeoNatan
    LeoNatan committed Oct 13, 2016
    Configuration menu
    Copy the full SHA
    cb419e6 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2016

  1. Scripts overhaul

    @LeoNatan
    LeoNatan committed Oct 14, 2016
    Configuration menu
    Copy the full SHA
    3277efc View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2016

  1. Add new idling resources for dispatch queue, JS display link, JS runl… 

    …oop and JS timers (setTimeout).

To support this change, the Detox framework must be linked into the tested binary, or else EarlGrey's use of fishhook fails (due to limitations on how fishhook works). So instead of calling `detoxConditionalInit` somewhere in the calling process, it is now run automatically very early on when the Detox dynamic library is loaded by the dynamic loader.
    @LeoNatan
    LeoNatan committed Oct 18, 2016
    Configuration menu
    Copy the full SHA
    a798f04 View commit details
    Browse the repository at this point in the history

  2. Update tests to work with new Detox.

    @LeoNatan
    LeoNatan committed Oct 18, 2016
    Configuration menu
    Copy the full SHA
    f81daed View commit details
    Browse the repository at this point in the history

Commits on Oct 19, 2016

  1. Add native timeout.

    @LeoNatan
    LeoNatan committed Oct 19, 2016
    Configuration menu
    Copy the full SHA
    281c7b8 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2016

  1. Remove unneeded imports from public header file.

    @LeoNatan
    LeoNatan committed Oct 25, 2016
    Configuration menu
    Copy the full SHA
    c543cbf View commit details
    Browse the repository at this point in the history

  2. Make Detox scheme shared

    @LeoNatan
    LeoNatan committed Oct 25, 2016
    Configuration menu
    Copy the full SHA
    6b7be12 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2016

  1. Fix symbolic links in SocketRocket after npm install, causing compile… 

    … issues
    @LeoNatan
    LeoNatan committed Oct 26, 2016
    Configuration menu
    Copy the full SHA
    d6552de View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2016

  1. Add detox deployment script for Xcode projects

    @LeoNatan
    LeoNatan committed Nov 4, 2016
    Configuration menu
    Copy the full SHA
    351d828 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2016

  1. Script fixes

    @LeoNatan
    LeoNatan committed Nov 10, 2016
    Configuration menu
    Copy the full SHA
    9804005 View commit details
    Browse the repository at this point in the history

  2. Upgrade EarlGrey with improved scrolling performance.

    @LeoNatan
    LeoNatan committed Nov 10, 2016
    Configuration menu
    Copy the full SHA
    9dcdba2 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2016

  1. moved fbsimctl to postinstall

    @rotemmiz
    rotemmiz committed Nov 27, 2016
    1 Configuration menu
    Copy the full SHA
    6905745 View commit details
    Browse the repository at this point in the history

  2. bump major

    @rotemmiz
    rotemmiz committed Nov 27, 2016
    Configuration menu
    Copy the full SHA
    323bb86 View commit details
    Browse the repository at this point in the history

  3. Update deploy script to use correct path.

    @LeoNatan
    LeoNatan authored Nov 27, 2016
    Configuration menu
    Copy the full SHA
    59099fe View commit details
    Browse the repository at this point in the history

  4. Merge branch 'improve_tooling' of github.com:wix/detox into improve_t… 

    …ooling
    @rotemmiz
    rotemmiz committed Nov 27, 2016
    Configuration menu
    Copy the full SHA
    744ab05 View commit details
    Browse the repository at this point in the history

  5. Update postinstall.js

    @LeoNatan
    LeoNatan authored Nov 27, 2016
    Configuration menu
    Copy the full SHA
    a44aac2 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'improve_tooling' of github.com:wix/detox into improve_t… 

    …ooling
    @rotemmiz
    rotemmiz committed Nov 27, 2016
    Configuration menu
    Copy the full SHA
    c08753a View commit details
    Browse the repository at this point in the history

  7. bump

    @rotemmiz
    rotemmiz committed Nov 27, 2016
    Configuration menu
    Copy the full SHA
    096a9f9 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2016

  1. Update postinstall.js

    @LeoNatan
    LeoNatan committed Nov 30, 2016
    Configuration menu
    Copy the full SHA
    c41678a View commit details
    Browse the repository at this point in the history

  2. version ++

    @LeoNatan
    LeoNatan committed Nov 30, 2016
    Configuration menu
    Copy the full SHA
    affdb80 View commit details
    Browse the repository at this point in the history

  3. Use bash script to remove shelljs dependency. 

    Sorry @rotemmiz
    @LeoNatan
    LeoNatan committed Nov 30, 2016
    Configuration menu
    Copy the full SHA
    1c195c0 View commit details
    Browse the repository at this point in the history

  4. Version ++

    @LeoNatan
    LeoNatan committed Nov 30, 2016
    Configuration menu
    Copy the full SHA
    3951014 View commit details
    Browse the repository at this point in the history

  5. Use iOS 10.1 in test.

    @LeoNatan
    LeoNatan committed Nov 30, 2016
    Configuration menu
    Copy the full SHA
    7743a8d View commit details
    Browse the repository at this point in the history

  6. Fix Detox logic

    @LeoNatan
    LeoNatan committed Nov 30, 2016
    Configuration menu
    Copy the full SHA
    017e7fc View commit details
    Browse the repository at this point in the history

  7. major version 4

    @DanielZlotin
    DanielZlotin committed Nov 30, 2016
    Configuration menu
    Copy the full SHA
    994af2a View commit details
    Browse the repository at this point in the history

  8. Improve npm deployment

    @LeoNatan
    LeoNatan committed Nov 30, 2016
    Configuration menu
    Copy the full SHA
    8a0d82b View commit details
    Browse the repository at this point in the history

  9. Ignore dirty submodules

    @LeoNatan
    LeoNatan committed Nov 30, 2016
    Configuration menu
    Copy the full SHA
    7713189 View commit details
    Browse the repository at this point in the history

  10. Version ++

    @LeoNatan
    LeoNatan committed Nov 30, 2016
    Configuration menu
    Copy the full SHA
    bd416ce View commit details
    Browse the repository at this point in the history

  11. Merge master branch

    @LeoNatan
    LeoNatan committed Nov 30, 2016
    Configuration menu
    Copy the full SHA
    346c268 View commit details
    Browse the repository at this point in the history