opendev/gerrit
Code Issues Proposed changes

Merge changes Ic30da5fc,I0efdf85b

Browse Source 
* changes:
  Convert base-url-behavior test to karma test
  Rename base-url-behavior_test.html to .js
This commit is contained in:
Dmitrii Filippov
2020-06-25 11:57:20 +00:00
committed by Gerrit Code Review
parent cbe3913855 edf3afcb57
commit 5463f36d38
4 changed files with 52 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
polygerrit-ui/app/.eslintrc.js
View File

@@ -206,6 +206,7 @@ module.exports = {
"stub": "readonly", "stub": "readonly",
"suite": "readonly", "suite": "readonly",
"suiteSetup": "readonly", "suiteSetup": "readonly",
"suiteTeardown": "readonly",
"teardown": "readonly", "teardown": "readonly",
"test": "readonly", "test": "readonly",
"fixtureFromElement": "readonly", "fixtureFromElement": "readonly",

74
polygerrit-ui/app/behaviors/base-url-behavior/base-url-behavior_test.html
View File

@@ -1,74 +0,0 @@
<!DOCTYPE html>
<!--
@license
Copyright (C) 2017 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
<meta charset="utf-8">
<title>base-url-behavior</title>
<script src="/node_modules/@webcomponents/webcomponentsjs/custom-elements-es5-adapter.js"></script>
<script src="/node_modules/@webcomponents/webcomponentsjs/webcomponents-lite.js"></script>
<script src="/components/wct-browser-legacy/browser.js"></script>
<script type="module">
import '../../test/common-test-setup.js';
/** @type {string} */
window.CANONICAL_PATH = '/r';
</script>
<test-fixture id="basic">
<template>
<test-element></test-element>
</template>
</test-fixture>
<test-fixture id="within-overlay">
<template>
<gr-overlay>
<test-element></test-element>
</gr-overlay>
</template>
</test-fixture>
<script type="module">
import '../../test/common-test-setup.js';
import {Polymer} from '@polymer/polymer/lib/legacy/polymer-fn.js';
import {BaseUrlBehavior} from './base-url-behavior.js';
suite('base-url-behavior tests', () => {
let element;
// eslint-disable-next-line no-unused-vars
let overlay;
suiteSetup(() => {
// Define a Polymer element that uses this behavior.
Polymer({
is: 'test-element',
behaviors: [
BaseUrlBehavior,
],
});
});
setup(() => {
element = fixture('basic');
overlay = fixture('within-overlay');
});
test('getBaseUrl', () => {
assert.deepEqual(element.getBaseUrl(), '/r');
});
});
</script>

51
polygerrit-ui/app/behaviors/base-url-behavior/base-url-behavior_test.js Normal file
View File

@@ -0,0 +1,51 @@
/**
* @license
* Copyright (C) 2017 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import '../../test/common-test-setup-karma.js';
import {Polymer} from '@polymer/polymer/lib/legacy/polymer-fn.js';
import {BaseUrlBehavior} from './base-url-behavior.js';
const basicFixture = fixtureFromElement('test-element');
suite('base-url-behavior tests', () => {
let element;
let originialCanonicalPath;
suiteSetup(() => {
originialCanonicalPath = window.CANONICAL_PATH;
window.CANONICAL_PATH = '/r';
// Define a Polymer element that uses this behavior.
Polymer({
is: 'test-element',
behaviors: [
BaseUrlBehavior,
],
});
});
suiteTeardown(() => {
window.CANONICAL_PATH = originialCanonicalPath;
});
setup(() => {
element = basicFixture.instantiate();
});
test('getBaseUrl', () => {
assert.deepEqual(element.getBaseUrl(), '/r');
});
});

1
polygerrit-ui/app/test/tests.js
View File

@@ -207,7 +207,6 @@ for (let file of elements) {
// Behaviors tests. // Behaviors tests.
/* eslint-disable max-len */ /* eslint-disable max-len */
const behaviors = [ const behaviors = [
'base-url-behavior/base-url-behavior_test.html',
'docs-url-behavior/docs-url-behavior_test.html', 'docs-url-behavior/docs-url-behavior_test.html',
'dom-util-behavior/dom-util-behavior_test.html', 'dom-util-behavior/dom-util-behavior_test.html',
'keyboard-shortcut-behavior/keyboard-shortcut-behavior_test.html', 'keyboard-shortcut-behavior/keyboard-shortcut-behavior_test.html',