Skip to content

Commit

Permalink
Fixes tests
Browse files Browse the repository at this point in the history
  • Loading branch information
ChristianE committed May 10, 2021
1 parent 939b6e1 commit 454e18b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 27 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export class MetricChooserPageObject {
}

async getAreaMetricValue(): Promise<number> {
await page.waitForSelector("area-metric-chooser-component .metric-value span")
return page.$eval("area-metric-chooser-component .metric-value span", element => element["innerText"])
await page.waitForSelector("area-metric-chooser-component .metric-value span.value")
return page.$eval("area-metric-chooser-component .metric-value span.value", element => element["innerText"])
}
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<div class="metric-value" ng-show="$ctrl._viewModel.hoveredNode">
<div class="rounded-box">
<metric-type-component metric-selection="areaMetric"></metric-type-component>
<span>{{ $ctrl._viewModel.hoveredNode.attributes[$ctrl._viewModel.areaMetric] | number }}</span>
<span class="value">{{ $ctrl._viewModel.hoveredNode.attributes[$ctrl._viewModel.areaMetric] | number }}</span>
</div>
<div class="rounded-box" ng-show="$ctrl._viewModel.hoveredNode.deltas">
<span>&Delta;{{ $ctrl._viewModel.hoveredNode.deltas[$ctrl._viewModel.areaMetric] | number }}</span>
<span class="value">&Delta;{{ $ctrl._viewModel.hoveredNode.deltas[$ctrl._viewModel.areaMetric] | number }}</span>
</div>
</div>
23 changes: 0 additions & 23 deletions visualization/app/codeCharta/ui/ribbonBar/ribbonBar.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,13 @@ import { MetricChooserPageObject } from "../metricChooser/metricChooser.po"
import { SearchPanelModeSelectorPageObject } from "../searchPanelModeSelector/searchPanelModeSelector.po"
import { MapTreeViewLevelPageObject } from "../mapTreeView/mapTreeView.level.po"
import { AreaSettingsPanelPageObject } from "../areaSettingsPanel/areaSettingsPanel.po"
import { ColorSettingsPageObject } from "../colorSettingsPanel/colorSettingsPanel.po"

describe("RibbonBar", () => {
let searchPanel: SearchPanelPageObject
let searchPanelModeSelector: SearchPanelModeSelectorPageObject
let ribbonBar: RibbonBarPageObject
let metricChooser: MetricChooserPageObject
let mapTreeViewLevel: MapTreeViewLevelPageObject
const bound = 10

beforeEach(async () => {
searchPanel = new SearchPanelPageObject()
Expand Down Expand Up @@ -128,25 +126,4 @@ describe("RibbonBar", () => {

expect(await ribbonBar.isPanelOpen(areaPanel)).toBeTruthy()
})

it("should check if reset button height matches the height of the last entry of color component", async () => {
const colorPanel = "color-metric"

await ribbonBar.togglePanel(colorPanel)
const boundingBoxCheckbox = await ColorSettingsPageObject.toggleInverColorBoundingBox()
const boundingBoxResetButton = await ColorSettingsPageObject.resetButtonBoundingBox()

expect(Math.abs(boundingBoxCheckbox.y - boundingBoxResetButton.y)).toBeLessThan(bound)
})

it("should check if reset button height matches the height of the last entry of area component", async () => {
const areaPanel = "area-metric"

await ribbonBar.togglePanel(areaPanel)

const boundingBoxCheckbox = await AreaSettingsPanelPageObject.toggleMarginBoundingBox()
const boundingBoxResetButton = await AreaSettingsPanelPageObject.resetButtonBoundingBox()

expect(Math.abs(boundingBoxCheckbox.y - boundingBoxResetButton.y)).toBeLessThan(bound)
})
})

0 comments on commit 454e18b

Please sign in to comment.