Merge pull request #40 from wix/class-matcher

added match by type

detox/ios/Detox/GREYMatchers+Detox.h

@@ -18,4 +18,6 @@
 
 + (id<GREYMatcher>)detoxMatcherForNot:(id<GREYMatcher>)matcher;
 
++ (id<GREYMatcher>)detoxMatcherForClass:(NSString *)aClassName;
+
 @end

detox/ios/Detox/GREYMatchers+Detox.m

@@ -47,4 +47,10 @@ @implementation GREYMatchers (Detox)
     return grey_not(matcher);
 }
 
++ (id<GREYMatcher>)detoxMatcherForClass:(NSString *)aClassName
+{
+    Class klass = NSClassFromString(aClassName);
+    return grey_kindOfClass(klass);
+}
+
 @end

detox/src/ios/expect.js

@@ -42,6 +42,15 @@ class IdMatcher extends Matcher {
   }
 }
 
+class TypeMatcher extends Matcher {
+  constructor(value) {
+    super();
+    if (typeof value !== 'string') throw new Error(`TypeMatcher ctor argument must be a string, got ${typeof value}`);
+    this._call = invoke.call(invoke.IOS.Class('GREYMatchers'), 'detoxMatcherForClass:', value);
+  }
+}
+
+
 class VisibleMatcher extends Matcher {
   constructor() {
     super();
@@ -358,7 +367,8 @@ function element(matcher) {
 
 const by = {
   label: (value) => new LabelMatcher(value),
-  id: (value) => new IdMatcher(value)
+  id: (value) => new IdMatcher(value),
+  type: (value) => new TypeMatcher(value)
 };
 
 const exportGlobals = function () {

detox/test/e2e/b-matchers.js

@@ -18,4 +18,10 @@ describe('Matchers', function () {
     expect(element(by.label('ID Working!!!'))).toBeVisible();
   });
 
+  it('should match elements by type', function () {
+    expect(element(by.type('RCTImageView'))).toBeVisible();
+    element(by.type('RCTImageView')).tap();
+    expect(element(by.type('RCTImageView'))).toBeNotVisible();
+  });
+
 });

detox/test/package.json

@@ -10,8 +10,8 @@
   },
   "dependencies": {
     "lodash": "^4.14.1",
-    "react": "15.1.0",
-    "react-native": "^0.27.2"
+    "react": "15.2.1",
+    "react-native": "0.31.0"
   },
   "devDependencies": {
     "detox": "file:..",

detox/test/src/Screens/MatchersScreen.js

@@ -2,6 +2,7 @@ import React, { Component } from 'react';
 import {
   Text,
   View,
+  Image,
   TouchableOpacity
 } from 'react-native';
 
@@ -27,6 +28,11 @@ export default class MatchersScreen extends Component {
           <Text testID='UniqueId345' style={{color: 'blue', marginBottom: 20}}>ID</Text>
         </TouchableOpacity>
 
+        {!this.state.hideStar ?
+          <TouchableOpacity onPress={this.onStarPress.bind(this)}>
+            <Image source={require('../assets/star.png')}/>
+          </TouchableOpacity> : null}
+
       </View>
     );
   }
@@ -47,4 +53,10 @@ export default class MatchersScreen extends Component {
     });
   }
 
+  onStarPress() {
+    this.setState({
+      hideStar: true
+    });
+  }
+
 }