From 7ff0561a230381cf0d71de5626ab9c10cfcdd4f1 Mon Sep 17 00:00:00 2001
From: Matt Mazzola <mattm@microsoft.com>
Date: Tue, 14 Jun 2016 13:57:19 -0700
Subject: [PATCH] Change setActivePage to setPage, and change setPage method to
 take pageName instead of pageObject

---
 e2e/protocol.e2e.spec.ts       | 21 +++++++++------------
 e2e/utility/mockApp.ts         |  6 +++---
 e2e/utility/mockReportEmbed.ts |  2 +-
 src/report.ts                  |  7 ++++++-
 4 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/e2e/protocol.e2e.spec.ts b/e2e/protocol.e2e.spec.ts
index 900a738c..318ba619 100644
--- a/e2e/protocol.e2e.spec.ts
+++ b/e2e/protocol.e2e.spec.ts
@@ -249,8 +249,7 @@ describe('Protocol', function () {
         // Arrange
         const testData = {
           page: {
-            name: "fakeName",
-            displayName: "fakeDisplayName"
+            name: "fakeName"
           }
         };
         
@@ -262,11 +261,11 @@ describe('Protocol', function () {
               .catch(response => {
         // Assert
                 expect(spyApp.validatePage).toHaveBeenCalledWith(testData.page);
-                expect(spyApp.setActivePage).not.toHaveBeenCalled();
+                expect(spyApp.setPage).not.toHaveBeenCalled();
                 expect(response.statusCode).toEqual(400);
         // Cleanup
                 spyApp.validatePage.calls.reset();
-                spyApp.setActivePage.calls.reset();
+                spyApp.setPage.calls.reset();
                 done();
               });
           });
@@ -276,8 +275,7 @@ describe('Protocol', function () {
         // Arrange
         const testData = {
           page: {
-            name: "fakeName",
-            displayName: "fakeDisplayName"
+            name: "fakeName"
           }
         };
         
@@ -290,11 +288,11 @@ describe('Protocol', function () {
               .then(response => {
         // Assert
                 expect(spyApp.validatePage).toHaveBeenCalledWith(testData.page);
-                expect(spyApp.setActivePage).toHaveBeenCalledWith(testData.page);
+                expect(spyApp.setPage).toHaveBeenCalledWith(testData.page);
                 expect(response.statusCode).toEqual(202);
         // Cleanup
                 spyApp.validatePage.calls.reset();
-                spyApp.setActivePage.calls.reset();
+                spyApp.setPage.calls.reset();
                 done();
               });
           });
@@ -304,8 +302,7 @@ describe('Protocol', function () {
         // Arrange
         const testData = {
           page: {
-            name: "fakeName",
-            displayName: "fakeDisplayName"
+            name: "fakeName"
           },
           expectedEvent: {
             method: 'POST',
@@ -325,12 +322,12 @@ describe('Protocol', function () {
               .then(response => {
         // Assert
                 expect(spyApp.validatePage).toHaveBeenCalledWith(testData.page);
-                expect(spyApp.setActivePage).toHaveBeenCalledWith(testData.page);
+                expect(spyApp.setPage).toHaveBeenCalledWith(testData.page);
                 expect(response.statusCode).toEqual(202);
                 expect(spyHandler.handle).toHaveBeenCalledWith(jasmine.objectContaining(testData.expectedEvent));
         // Cleanup
                 spyApp.validateLoad.calls.reset();
-                spyApp.setActivePage.calls.reset();
+                spyApp.setPage.calls.reset();
                 done();
               });
           });
diff --git a/e2e/utility/mockApp.ts b/e2e/utility/mockApp.ts
index 7af1d278..c4310c12 100644
--- a/e2e/utility/mockApp.ts
+++ b/e2e/utility/mockApp.ts
@@ -41,7 +41,7 @@ export interface IApp {
   
   // Pages
   getPages(): Promise<IPage>;
-  setActivePage(page: IPage): Promise<void>;
+  setPage(pageName: string): Promise<void>;
   togglePageNavigation(): Promise<void>;
   validatePage(page: IPage): Promise<IValidationResponse>;
   // Filters
@@ -66,7 +66,7 @@ export const mockAppSpyObj = {
   validateSettings: jasmine.createSpy("validateSettings").and.returnValue(Promise.resolve(null)),
   // Pages
   getPages: jasmine.createSpy("getPages").and.returnValue(Promise.resolve(null)),
-  setActivePage: jasmine.createSpy("setActivePage").and.returnValue(Promise.resolve(null)),
+  setPage: jasmine.createSpy("setPage").and.returnValue(Promise.resolve(null)),
   togglePageNavigation: jasmine.createSpy("togglePageNavigation").and.returnValue(Promise.resolve(null)),
   validatePage: jasmine.createSpy("validatePage").and.returnValue(Promise.resolve(null)),
   // Filters
@@ -87,7 +87,7 @@ export const mockAppSpyObj = {
     mockAppSpyObj.updateSettings.calls.reset();
     mockAppSpyObj.validateSettings.calls.reset();
     mockAppSpyObj.getPages.calls.reset();
-    mockAppSpyObj.setActivePage.calls.reset();
+    mockAppSpyObj.setPage.calls.reset();
     mockAppSpyObj.togglePageNavigation.calls.reset();
     mockAppSpyObj.validatePage.calls.reset();
     mockAppSpyObj.validateFilter.calls.reset();
diff --git a/e2e/utility/mockReportEmbed.ts b/e2e/utility/mockReportEmbed.ts
index bdc87cb4..8fb6fccd 100644
--- a/e2e/utility/mockReportEmbed.ts
+++ b/e2e/utility/mockReportEmbed.ts
@@ -60,7 +60,7 @@ export function setup(iframeContentWindow: Window, parentWindow: Window, logMess
     const page = req.body;
     return app.validatePage(page)
       .then(() => {
-        app.setActivePage(page)
+        app.setPage(page)
           .then(page => {
             const initiator = "sdk";
             hpm.post('/report/events/pageChanged', {
diff --git a/src/report.ts b/src/report.ts
index 988df216..ff5ef5d2 100644
--- a/src/report.ts
+++ b/src/report.ts
@@ -155,7 +155,12 @@ export class Report extends Embed {
     /**
      * Set the active page
      */
-    setActivePage(page: IPage): Promise<void> {
+    setPage(pageName: string): Promise<void> {
+        const page: IPage = {
+            name: pageName,
+            displayName: null
+        };
+
         return this.hpm.put<IError[]>('/report/pages/active', page)
             .catch(response => {
                 throw response.body;