[Plots] #638 Addressing feedback from code review

[Plots] #638 Fixing failing tests

[Plot] Changed PlotOptionsController to prototype form

Fixed spacing

Fixed jslint issue
This commit is contained in:
Henry
2016-02-08 23:05:48 -08:00
parent be031285b9
commit 645bd5743f
15 changed files with 188 additions and 357 deletions

View File

@@ -29,77 +29,76 @@ define(
describe("The region class ", function () {
var region,
part2 = {'name': 'part2'};
part2 = new Region({'name': 'part2'});
beforeEach(function(){
region = new Region();
region.parts = [
{name: 'part1'},
{name: 'part3'},
{name: 'part4'}
region.regions = [
new Region({name: 'part1'}),
new Region({name: 'part3'}),
new Region({name: 'part4'})
];
});
it("adding a region part at a specified index adds it in that" +
it("adding a region at a specified index adds it in that" +
" position", function() {
region.addPart(part2, 1);
region.addRegion(part2, 1);
expect(region.parts.length).toBe(4);
expect(region.parts[1]).toBe(part2);
expect(region.regions.length).toBe(4);
expect(region.regions[1]).toBe(part2);
});
it("adding a region part without an index adds it at the end", function() {
var partN = {'name': 'partN'};
it("adding a region without an index adds it at the end", function() {
var partN = new Region({'name': 'partN'});
region.addPart(partN);
region.addRegion(partN);
expect(region.parts.length).toBe(4);
expect(region.parts[region.parts.length-1]).toBe(partN);
expect(region.regions.length).toBe(4);
expect(region.regions[region.regions.length-1]).toBe(partN);
});
describe("removing a region part", function(){
describe("removing a region", function(){
var partName = "part2";
beforeEach(function(){
region.parts = [
{name: 'part1'},
region.regions = [
new Region({name: 'part1'}),
part2,
{name: 'part3'},
{name: 'part4'}
new Region({name: 'part3'}),
new Region({name: 'part4'})
];
});
it("with a string matches on region part" +
" name", function() {
expect(region.parts.length).toBe(4);
expect(region.parts.indexOf(part2)).toBe(1);
it("with a string matches on region name", function() {
expect(region.regions.length).toBe(4);
expect(region.regions.indexOf(part2)).toBe(1);
region.removePart(partName);
region.removeRegion(partName);
expect(region.parts.length).toBe(3);
expect(region.parts.indexOf(part2)).toBe(-1);
expect(region.regions.length).toBe(3);
expect(region.regions.indexOf(part2)).toBe(-1);
});
it("with a number removes by index", function() {
expect(region.parts.length).toBe(4);
expect(region.parts.indexOf(part2)).toBe(1);
expect(region.regions.length).toBe(4);
expect(region.regions.indexOf(part2)).toBe(1);
region.removePart(1);
region.removeRegion(1);
expect(region.parts.length).toBe(3);
expect(region.parts.indexOf(part2)).toBe(-1);
expect(region.regions.length).toBe(3);
expect(region.regions.indexOf(part2)).toBe(-1);
});
it("with object matches that object", function() {
expect(region.parts.length).toBe(4);
expect(region.parts.indexOf(part2)).toBe(1);
expect(region.regions.length).toBe(4);
expect(region.regions.indexOf(part2)).toBe(1);
region.removePart(part2);
region.removeRegion(part2);
expect(region.parts.length).toBe(3);
expect(region.parts.indexOf(part2)).toBe(-1);
expect(region.regions.length).toBe(3);
expect(region.regions.indexOf(part2)).toBe(-1);
});
});
});