From 81d0956450f126de5f58eb061eebf5e98dcec873 Mon Sep 17 00:00:00 2001
From: James Baxley <james.baxley@newspring.cc>
Date: Tue, 28 Jun 2016 19:22:26 -0400
Subject: [PATCH] naming changes

---
 src/server.ts         |  8 ++++----
 test/server/index.tsx | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/server.ts b/src/server.ts
index 4f1a34f71f..8013038245 100644
--- a/src/server.ts
+++ b/src/server.ts
@@ -171,7 +171,7 @@ function getQueriesFromTree({
 }
 
 // XXX component Cache
-export function getData(
+export function getDataFromTree(
   components,
   defaultProps: Object = {},
   defaultContext: Object = {}
@@ -204,7 +204,7 @@ export function getData(
           if (!child) return;
 
           // traverse children nodes
-          return getData(child, defaultProps, context);
+          return getDataFromTree(child, defaultProps, context);
         });
         return Promise.all(subTrees);
       })
@@ -213,7 +213,7 @@ export function getData(
 }
 
 export function renderToStringWithData(component) {
-  return getData(component)
+  return getDataFromTree(component)
     .then(({ context }) => {
       let markup = ReactDOM.renderToString(component);
       let initialState = context.store.getState();
@@ -225,7 +225,7 @@ export function renderToStringWithData(component) {
         for (let field of fieldsToNotShip)  delete initialState[key].queries[queryId][field];
       }
       initialState = encodeURI(JSON.stringify(initialState));
-      const payload = `<script>window.__apollo_data__ = ${initialState};</script>`;
+      const payload = `<script>window.__APOLLO_STATE__ = ${initialState};</script>`;
       markup += payload;
       return markup;
     });
diff --git a/test/server/index.tsx b/test/server/index.tsx
index 06ea8693c8..4e0aa3bdf8 100644
--- a/test/server/index.tsx
+++ b/test/server/index.tsx
@@ -3,7 +3,7 @@ import * as React from 'react';
 import * as ReactDOM from 'react-dom/server';
 import ApolloClient, { createNetworkInterface } from 'apollo-client';
 import { connect, ApolloProvider } from '../../src';
-import { getData, renderToStringWithData } from '../../src/server';
+import { getDataFromTree, renderToStringWithData } from '../../src/server';
 import 'isomorphic-fetch';
 
 import gql from 'graphql-tag';
@@ -55,7 +55,7 @@ describe('SSR', () => {
     }
   });
 
-  describe('`getData`', () => {
+  describe('`getDataFromTree`', () => {
     it('should run through all of the queries that want SSR', (done) => {
       const Element = ({ data }) => {
         return <div>{data.loading ? 'loading' : data.currentUser.firstName}</div>;
@@ -102,7 +102,7 @@ describe('SSR', () => {
         </ApolloProvider>
       );
 
-      getData(app)
+      getDataFromTree(app)
         .then(() => {
           const markup = ReactDOM.renderToString(app);
           expect(markup).to.match(/James/);
@@ -153,7 +153,7 @@ describe('SSR', () => {
         </ApolloProvider>
       );
 
-      getData(app)
+      getDataFromTree(app)
         .then(({ initialState }) => {
           expect(initialState.apollo.data).to.exist;
           expect(initialState.apollo.data['ROOT_QUERY.currentUser']).to.exist;
@@ -203,7 +203,7 @@ describe('SSR', () => {
         </ApolloProvider>
       );
 
-      getData(app)
+      getDataFromTree(app)
         .then(({ initialState }) => {
           expect(initialState.apollo.data).to.exist;
           expect(initialState.apollo.data['ROOT_QUERY.currentUser']).to.not.exist;
@@ -389,7 +389,7 @@ describe('SSR', () => {
           expect(markup).to.match(/Return of the Jedi/);
           expect(markup).to.match(/Planets/);
           expect(markup).to.match(/Tatooine/);
-          expect(markup).to.match(/__apollo_data__/);
+          expect(markup).to.match(/__APOLLO_STATE__/);
           done();
         })
         .catch(done);