opendev/gerrit
Code Issues Proposed changes

Use only Gerrit.install as a plugin loaded signal

Browse Source 
Counting .html based plugin import as a load signal resulted in double
counting.

Change-Id: I63a096b3801b0dd889737ae847b29b0f6c8167f5
This commit is contained in:
Viktar Donich
2017-10-01 10:11:12 +01:00
parent 4e0da79d07
commit 81b58f8a71
4 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
polygerrit-ui/app/elements/change/gr-change-metadata/gr-change-metadata-it_test.html
View File

@@ -93,7 +93,8 @@ limitations under the License.
plugin: {
js_resource_paths: [],
html_resource_paths: [
new URL('test/plugin.html', window.location.href).toString(),
new URL('test/plugin.html?' + Math.random(),
window.location.href).toString(),
],
},
};

2
polygerrit-ui/app/elements/plugins/gr-endpoint-decorator/gr-endpoint-decorator_test.html
View File

@@ -24,6 +24,8 @@ limitations under the License.
<link rel="import" href="gr-endpoint-decorator.html">
<link rel="import" href="../gr-endpoint-param/gr-endpoint-param.html">
<script>void(0);</script>
<test-fixture id="basic">
<template>
<gr-endpoint-decorator name="foo">

4
polygerrit-ui/app/elements/plugins/gr-plugin-host/gr-plugin-host.js
View File

@@ -47,12 +47,10 @@
* States that it expects no more than 3 parameters, but that's not true.
* @todo (beckysiegel) check Polymer annotations and submit change.
*/
_importHtmlPlugins(plugins) {
for (const url of plugins) {
this.importHref(
this._urlFor(url), Gerrit._pluginInstalled, Gerrit._pluginInstalled,
true);
this._urlFor(url), null, Gerrit._pluginInstalled, true);
}
},

22
polygerrit-ui/app/elements/plugins/gr-plugin-host/gr-plugin-host_test.html
View File

@@ -23,6 +23,8 @@ limitations under the License.
<link rel="import" href="../../../test/common-test-setup.html"/>
<link rel="import" href="gr-plugin-host.html">
<script>void(0);</script>
<test-fixture id="basic">
<template>
<gr-plugin-host></gr-plugin-host>
@@ -61,9 +63,9 @@ limitations under the License.
plugin: {html_resource_paths: ['foo/bar', 'baz']},
};
assert.isTrue(element.importHref.calledWith(
'/foo/bar', Gerrit._pluginInstalled, Gerrit._pluginInstalled, true));
'/foo/bar', null, Gerrit._pluginInstalled, true));
assert.isTrue(element.importHref.calledWith(
'/baz', Gerrit._pluginInstalled, Gerrit._pluginInstalled, true));
'/baz', null, Gerrit._pluginInstalled, true));
});
test('imports relative html plugins from config with a base url', () => {
@@ -71,11 +73,9 @@ limitations under the License.
element.config = {
plugin: {html_resource_paths: ['foo/bar', 'baz']}};
assert.isTrue(element.importHref.calledWith(
'/the-base/foo/bar', Gerrit._pluginInstalled, Gerrit._pluginInstalled,
true));
'/the-base/foo/bar', null, Gerrit._pluginInstalled, true));
assert.isTrue(element.importHref.calledWith(
'/the-base/baz', Gerrit._pluginInstalled, Gerrit._pluginInstalled,
true));
'/the-base/baz', null, Gerrit._pluginInstalled, true));
});
test('imports absolute html plugins from config', () => {
@@ -88,11 +88,9 @@ limitations under the License.
},
};
assert.isTrue(element.importHref.calledWith(
'http://example.com/foo/bar', Gerrit._pluginInstalled,
Gerrit._pluginInstalled, true));
'http://example.com/foo/bar', null, Gerrit._pluginInstalled, true));
assert.isTrue(element.importHref.calledWith(
'https://example.com/baz', Gerrit._pluginInstalled,
Gerrit._pluginInstalled, true));
'https://example.com/baz', null, Gerrit._pluginInstalled, true));
});
test('adds js plugins from config to the body', () => {
@@ -139,9 +137,9 @@ limitations under the License.
},
};
assert.isTrue(element.importHref.calledWith(
'/oof', Gerrit._pluginInstalled, Gerrit._pluginInstalled, true));
'/oof', null, Gerrit._pluginInstalled, true));
assert.isTrue(element.importHref.calledWith(
'/some', Gerrit._pluginInstalled, Gerrit._pluginInstalled, true));
'/some', null, Gerrit._pluginInstalled, true));
});
});
</script>