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

[Code Style] Rename shadowing variables

Browse Source
This commit is contained in:
Victor Woeltjen
2016-05-20 11:39:49 -07:00
parent e468080373
commit ad5691142e
56 changed files with 256 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
platform/core/test/capabilities/InstantiationCapabilitySpec.js
View File

@@ -73,16 +73,16 @@ define(
});
it("uses the instantiate service to create domain objects", function () {
var mockDomainObject = jasmine.createSpyObj('domainObject', [
var mockDomainObj = jasmine.createSpyObj('domainObject', [
'getId',
'getModel',
'getCapability',
'useCapability',
'hasCapability'
]), testModel = { someKey: "some value" };
mockInstantiate.andReturn(mockDomainObject);
mockInstantiate.andReturn(mockDomainObj);
expect(instantiation.instantiate(testModel))
.toBe(mockDomainObject);
.toBe(mockDomainObj);
expect(mockInstantiate)
.toHaveBeenCalledWith({
someKey: "some value",

4
platform/core/test/models/CachingModelDecoratorSpec.js
View File

@@ -99,7 +99,7 @@ define(
});
it("ensures a single object instance, even for multiple concurrent calls", function () {
var promiseA, promiseB, mockCallback = jasmine.createSpy();
var promiseA, promiseB;
promiseA = fakePromise();
promiseB = fakePromise();
@@ -126,7 +126,7 @@ define(
});
it("is robust against updating with undefined values", function () {
var promiseA, promiseB, mockCallback = jasmine.createSpy();
var promiseA, promiseB;
promiseA = fakePromise();
promiseB = fakePromise();

12
platform/core/test/views/ViewProviderSpec.js
View File

@@ -109,7 +109,7 @@ define(
it("restricts typed views to matching types", function () {
var testType = "testType",
testView = { key: "x", type: testType },
provider = new ViewProvider([testView], mockLog);
viewProvider = new ViewProvider([testView], mockLog);
// Include a "type" capability
capabilities.type = jasmine.createSpyObj(
@@ -120,21 +120,21 @@ define(
// Should be included when types match
capabilities.type.instanceOf.andReturn(true);
expect(provider.getViews(mockDomainObject))
expect(viewProvider.getViews(mockDomainObject))
.toEqual([testView]);
expect(capabilities.type.instanceOf)
.toHaveBeenCalledWith(testType);
// ...but not when they don't
capabilities.type.instanceOf.andReturn(false);
expect(provider.getViews(mockDomainObject))
expect(viewProvider.getViews(mockDomainObject))
.toEqual([]);
});
it("enforces view restrictions from types", function () {
var testView = { key: "x" },
provider = new ViewProvider([testView], mockLog);
viewProvider = new ViewProvider([testView], mockLog);
// Include a "type" capability
capabilities.type = jasmine.createSpyObj(
@@ -146,13 +146,13 @@ define(
// Should be included when view keys match
capabilities.type.getDefinition
.andReturn({ views: [testView.key]});
expect(provider.getViews(mockDomainObject))
expect(viewProvider.getViews(mockDomainObject))
.toEqual([testView]);
// ...but not when they don't
capabilities.type.getDefinition
.andReturn({ views: ["somethingElse"]});
expect(provider.getViews(mockDomainObject))
expect(viewProvider.getViews(mockDomainObject))
.toEqual([]);
});