From 5a94f81b4160c549172baa21f65785fd1f54b677 Mon Sep 17 00:00:00 2001
From: Orta Therox <orta.therox@gmail.com>
Date: Sat, 3 Dec 2016 13:00:26 +0000
Subject: [PATCH 1/2] Use node 6.7 on travis

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 7de7e75b17..3a03233e3b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,7 +2,7 @@ cache: yarn
 
 language: node_js
 node_js:
-  - "6.1"
+  - "6.7"
 
 install:
   - npm install -g yarn

From 4cd15b6d58325183d67aabc1259cdb265186f3c6 Mon Sep 17 00:00:00 2001
From: Orta Therox <orta.therox@gmail.com>
Date: Thu, 1 Dec 2016 16:18:17 +0000
Subject: [PATCH 2/2] Make master green, and remove all console errors

---
 .../__snapshots__/tab_view-tests.js.snap      | 30 ++++++++-----------
 lib/components/__tests__/tab_view-tests.js    |  2 ++
 .../__snapshots__/about-test.js.snap          | 13 ++------
 lib/components/gene/__tests__/about-test.js   |  3 +-
 4 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/lib/components/__tests__/__snapshots__/tab_view-tests.js.snap b/lib/components/__tests__/__snapshots__/tab_view-tests.js.snap
index 18d444749f..f39ac116e8 100644
--- a/lib/components/__tests__/__snapshots__/tab_view-tests.js.snap
+++ b/lib/components/__tests__/__snapshots__/tab_view-tests.js.snap
@@ -1,24 +1,20 @@
 exports[`test looks like expected 1`] = `
 <View>
-  <View
+  <SwitchView
+    onSelectionChange={[Function]}
+    selectedIndex={1}
     style={
+      Object {
+        "marginBottom": 30,
+        "marginLeft": 0,
+        "marginRight": 0,
+        "marginTop": 30,
+      }
+    }
+    titles={
       Array [
-        Object {
-          "alignSelf": "flex-start",
-          "borderColor": "red",
-          "borderWidth": 1,
-        },
-        Array [
-          Object {
-            "height": 46,
-          },
-          Object {
-            "marginBottom": 30,
-            "marginLeft": 0,
-            "marginRight": 0,
-            "marginTop": 30,
-          },
-        ],
+        "one",
+        "two",
       ]
     } />
   <View />
diff --git a/lib/components/__tests__/tab_view-tests.js b/lib/components/__tests__/tab_view-tests.js
index 21f43b3c70..87146e4672 100644
--- a/lib/components/__tests__/tab_view-tests.js
+++ b/lib/components/__tests__/tab_view-tests.js
@@ -1,6 +1,8 @@
 import 'react-native'
 import React from 'react'
 import renderer from 'react-test-renderer'
+
+jest.mock('../../components/switch_view', () => 'SwitchView')
 import TabView from '../tab_view'
 
 it('looks like expected', () => {
diff --git a/lib/components/gene/__tests__/__snapshots__/about-test.js.snap b/lib/components/gene/__tests__/__snapshots__/about-test.js.snap
index 78594a9af3..133d095a09 100644
--- a/lib/components/gene/__tests__/__snapshots__/about-test.js.snap
+++ b/lib/components/gene/__tests__/__snapshots__/about-test.js.snap
@@ -143,15 +143,15 @@ exports[`test shows trending artists correctly 1`] = `
             Object {
               "margin": 5,
               "paddingBottom": 20,
-              "width": 157,
+              "width": 1,
             }
           }>
           <ImageView
             imageURL=""
             style={
               Object {
-                "height": 105,
-                "width": 157,
+                "height": 1,
+                "width": 1,
               }
             } />
           <Text
@@ -184,13 +184,6 @@ exports[`test shows trending artists correctly 1`] = `
           </Text>
         </View>
       </TouchableWithoutFeedback>
-      <View
-        style={
-          Object {
-            "height": 105,
-            "width": 157,
-          }
-        } />
     </View>
   </View>
 </View>
diff --git a/lib/components/gene/__tests__/about-test.js b/lib/components/gene/__tests__/about-test.js
index 0396699f7f..57aa9bd25f 100644
--- a/lib/components/gene/__tests__/about-test.js
+++ b/lib/components/gene/__tests__/about-test.js
@@ -7,6 +7,7 @@ import renderer from 'react-test-renderer'
 
 jest.mock('../../opaque_image_view.js', () => 'ImageView')
 
+
 it('renders correctly', () => {
   const gene = {
     description: 'This is some example text',
@@ -20,7 +21,7 @@ it('shows trending artists correctly', () => {
   const gene = {
     description: 'This is some example text',
     trending_artists : [{
-      _id: '1',
+      __id: 'artist-uuid',
       href: '/thing/artist/url',
       name: 'Artist Name',
       counts: {