fix merge issues

Author: neryaco

package.json

@@ -14,7 +14,6 @@
     "build": "gulp build",
     "start": "http-server ./demo",
     "prestart": "cd demo && npm install",
-    "pretest": "typings install && gulp build",
     "test": "gulp test",
     "gulp": "gulp"
   },

test/test.spec.ts

@@ -79,84 +79,24 @@ describe('service', function () {
   });
 
   describe('init', function () {
-    describe('embeds all components found in the DOM', function () {
-      let powerbi: service.Service; // redefined for this scope
-
-      beforeEach(function() {
-        powerbi = new service.Service(factories.hpmFactory, factories.wpmpFactory, factories.routerFactory);
-        powerbi.accessToken = 'ABC123';
-      });
-
-      afterEach(function () {
-        powerbi.wpmp.stop();
-        powerbi = null;
-      });
-
-      it('should work with multiple elements without id', function () {
-        // Arrange
-        const elements = [
-          '<div powerbi-embed-url="https://embedded.powerbi.com/appTokenReportEmbed?reportId=ABC123" powerbi-type="report"></div>',
-          '<div powerbi-embed-url="https://embedded.powerbi.com/appTokenReportEmbed?reportId=XYZ456" powerbi-type="report"></div>',
-        ];
-
-        elements.forEach(element => {
-          $(element).appendTo('#powerbi-fixture');
-        });
-
-        // Act
-        powerbi.init();
-
-        // Assert
-        // If embed element has iframe inside it, assume embed action occurred
-        const iframes = document.querySelectorAll('[powerbi-embed-url] iframe');
-        expect(iframes.length).toEqual(2);
-        // Check the number of components controlled by powerbi
-        expect(powerbi.getNumberOfComponents()).toEqual(2);
-      });
-
-      it('should work with multiple elements with id', function () {
-        // Arrange
-        const elements = [
-          '<div id="first-report" powerbi-embed-url="https://embedded.powerbi.com/appTokenReportEmbed?reportId=ABC123" powerbi-type="report"></div>',
-          '<div id="second-report" powerbi-embed-url="https://embedded.powerbi.com/appTokenReportEmbed?reportId=XYZ456" powerbi-type="report"></div>',
-        ];
-
-        elements.forEach(element => {
-          $(element).appendTo('#powerbi-fixture');
-        });
-
-        // Act
-        powerbi.init();
+    it('embeds all components found in the DOM', function () {
+      // Arrange
+      const elements = [
+        '<div id="reportContainer1" powerbi-embed-url="https://embedded.powerbi.com/appTokenReportEmbed?reportId=ABC123" powerbi-type="report"></div>',
+        '<div id="reportContainer2" powerbi-embed-url="https://embedded.powerbi.com/appTokenReportEmbed?reportId=XYZ456" powerbi-type="report"></div>',
+      ];
 
-        // Assert
-        // If embed element has iframe inside it, assume embed action occurred
-        const iframes = document.querySelectorAll('[powerbi-embed-url] iframe');
-        expect(iframes.length).toEqual(2);
-        // Check the number of components controlled by powerbi
-        expect(powerbi.getNumberOfComponents()).toEqual(2);
+      elements.forEach(element => {
+        $(element).appendTo('#powerbi-fixture');
       });
 
-      it('should work with multiple elements with duplicated id', function () {
-        // Arrange
-        const elements = [
-          '<div id="report" powerbi-embed-url="https://embedded.powerbi.com/appTokenReportEmbed?reportId=ABC123" powerbi-type="report"></div>',
-          '<div id="report" powerbi-embed-url="https://embedded.powerbi.com/appTokenReportEmbed?reportId=XYZ456" powerbi-type="report"></div>',
-        ];
-
-        elements.forEach(element => {
-          $(element).appendTo('#powerbi-fixture');
-        });
-
-        // Act
-        powerbi.init();
+      // Act
+      powerbi.init();
 
-        // Assert
-        // If embed element has iframe inside it, assume embed action occurred
-        const iframes = document.querySelectorAll('[powerbi-embed-url] iframe');
-        expect(iframes.length).toEqual(2);
-        // Check the number of components controlled by powerbi
-        expect(powerbi.getNumberOfComponents()).toEqual(2);
-      });
+      // Assert
+      // If embed element has iframe inside it, assume embed action occurred
+      const iframes = document.querySelectorAll('[powerbi-embed-url] iframe');
+      expect(iframes.length).toEqual(2);
     });
 
     it('embeds all components found in the DOM without id attribute', function () {