alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into open401

Browse Source 
Resolve conflicts for #416

Conflicts:
	platform/commonUI/browse/bundle.json
	platform/commonUI/browse/src/BrowseController.js
This commit is contained in:
Victor Woeltjen
2016-02-22 14:27:21 -08:00
parent 43f6981ba1 b5c88e5c5c
commit d3e274bfdd
387 changed files with 14238 additions and 55416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
platform/commonUI/browse/test/BrowseControllerSpec.js
View File

@@ -19,7 +19,7 @@
* this source code distribution or the Licensing information page available
* at runtime from the About dialog for additional information.
*****************************************************************************/
/*global define,Promise,describe,it,expect,beforeEach,waitsFor,jasmine*/
/*global define,Promise,describe,it,expect,beforeEach,waitsFor,jasmine,xit,xdescribe*/
/**
* MCTRepresentationSpec. Created by vwoeltje on 11/6/14.
@@ -29,7 +29,8 @@ define(
function (BrowseController) {
"use strict";
describe("The browse controller", function () {
//TODO: Disabled for NEM Beta
xdescribe("The browse controller", function () {
var mockScope,
mockRoute,
mockLocation,