f73f8cf663
The 'mergeable' property of a change exists only if it is specifically asked for, otherwise it is undefined. This was causing some false positives when checking for merge conflicts. Also removes some dead code. Bug: Issue 6819 Change-Id: Ib42bac8067afacb09d20cd122f9d9f41425207e0
186 lines
5.0 KiB
HTML
186 lines
5.0 KiB
HTML
<!DOCTYPE html>
|
|
<!--
|
|
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">
|
|
<title>keyboard-shortcut-behavior</title>
|
|
|
|
<script src="../../bower_components/webcomponentsjs/webcomponents.min.js"></script>
|
|
<script src="../../bower_components/web-component-tester/browser.js"></script>
|
|
<link rel="import" href="../../test/common-test-setup.html"/>
|
|
<script>
|
|
/** @type {String} */
|
|
window.CANONICAL_PATH = '/r';
|
|
</script>
|
|
|
|
<link rel="import" href="../base-url-behavior/base-url-behavior.html">
|
|
<link rel="import" href="rest-client-behavior.html">
|
|
|
|
<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>
|
|
suite('rest-client-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: [
|
|
Gerrit.BaseUrlBehavior,
|
|
Gerrit.RESTClientBehavior,
|
|
],
|
|
});
|
|
});
|
|
|
|
setup(() => {
|
|
element = fixture('basic');
|
|
overlay = fixture('within-overlay');
|
|
});
|
|
|
|
test('changeBaseURL', () => {
|
|
assert.deepEqual(
|
|
element.changeBaseURL('1', '1'),
|
|
'/r/changes/1/revisions/1'
|
|
);
|
|
});
|
|
|
|
test('changePath', () => {
|
|
assert.deepEqual(element.changePath('1'), '/r/c/1');
|
|
});
|
|
|
|
test('Open status', () => {
|
|
const change = {
|
|
change_id: 'Iad9dc96274af6946f3632be53b106ef80f7ba6ca',
|
|
revisions: {
|
|
rev1: {_number: 1},
|
|
},
|
|
current_revision: 'rev1',
|
|
status: 'NEW',
|
|
labels: {},
|
|
mergeable: true,
|
|
};
|
|
const status = element.changeStatusString(change);
|
|
assert.equal(status, '');
|
|
});
|
|
|
|
test('Merge conflict', () => {
|
|
const change = {
|
|
change_id: 'Iad9dc96274af6946f3632be53b106ef80f7ba6ca',
|
|
revisions: {
|
|
rev1: {_number: 1},
|
|
},
|
|
current_revision: 'rev1',
|
|
status: 'NEW',
|
|
labels: {},
|
|
mergeable: false,
|
|
};
|
|
const status = element.changeStatusString(change);
|
|
assert.equal(status, 'Merge Conflict');
|
|
});
|
|
|
|
test('mergeable prop undefined', () => {
|
|
const change = {
|
|
change_id: 'Iad9dc96274af6946f3632be53b106ef80f7ba6ca',
|
|
revisions: {
|
|
rev1: {_number: 1},
|
|
},
|
|
current_revision: 'rev1',
|
|
status: 'NEW',
|
|
labels: {},
|
|
};
|
|
const status = element.changeStatusString(change);
|
|
assert.equal(status, '');
|
|
});
|
|
|
|
test('Merged status', () => {
|
|
const change = {
|
|
change_id: 'Iad9dc96274af6946f3632be53b106ef80f7ba6ca',
|
|
revisions: {
|
|
rev1: {_number: 1},
|
|
},
|
|
current_revision: 'rev1',
|
|
status: 'MERGED',
|
|
labels: {},
|
|
};
|
|
const status = element.changeStatusString(change);
|
|
assert.equal(status, 'Merged');
|
|
});
|
|
|
|
test('Abandoned status', () => {
|
|
const change = {
|
|
change_id: 'Iad9dc96274af6946f3632be53b106ef80f7ba6ca',
|
|
revisions: {
|
|
rev1: {_number: 1},
|
|
},
|
|
current_revision: 'rev1',
|
|
status: 'ABANDONED',
|
|
labels: {},
|
|
};
|
|
const status = element.changeStatusString(change);
|
|
assert.equal(status, 'Abandoned');
|
|
});
|
|
|
|
test('Open status with private and wip', () => {
|
|
const change = {
|
|
change_id: 'Iad9dc96274af6946f3632be53b106ef80f7ba6ca',
|
|
revisions: {
|
|
rev1: {_number: 1},
|
|
},
|
|
current_revision: 'rev1',
|
|
status: 'NEW',
|
|
is_private: true,
|
|
work_in_progress: true,
|
|
labels: {},
|
|
mergeable: true,
|
|
};
|
|
const status = element.changeStatusString(change);
|
|
assert.equal(status, 'WIP, Private');
|
|
});
|
|
|
|
test('Merge conflict with private and wip', () => {
|
|
const change = {
|
|
change_id: 'Iad9dc96274af6946f3632be53b106ef80f7ba6ca',
|
|
revisions: {
|
|
rev1: {_number: 1},
|
|
},
|
|
current_revision: 'rev1',
|
|
status: 'NEW',
|
|
is_private: true,
|
|
work_in_progress: true,
|
|
labels: {},
|
|
mergeable: false,
|
|
};
|
|
const status = element.changeStatusString(change);
|
|
assert.equal(status, 'Merge Conflict, WIP, Private');
|
|
});
|
|
});
|
|
</script>
|