1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

merge from dev

This commit is contained in:
Luke Pulverenti 2015-12-14 10:43:03 -05:00
parent 1c8f02ce0f
commit 33b01d778c
911 changed files with 34157 additions and 57125 deletions

View file

@ -1,5 +1,4 @@
<!doctype html>
<!--
<!DOCTYPE html><!--
@license
Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
@ -7,9 +6,7 @@ The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
Code distributed by Google as part of the polymer project is also
subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
-->
<html>
<head>
--><html><head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
<title>paper-button tests</title>
@ -18,8 +15,10 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
<body>
<script>
WCT.loadSuites([
'paper-button.html'
'paper-button.html',
'paper-button.html?dom=shadow'
]);
</script>
</body>
</html>
</body></html>

View file

@ -16,11 +16,9 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
<script src="../../webcomponentsjs/webcomponents-lite.js"></script>
<script src="../../web-component-tester/browser.js"></script>
<script src="../../test-fixture/test-fixture-mocha.js"></script>
<script src="../../iron-test-helpers/mock-interactions.js"></script>
<link rel="import" href="../paper-button.html">
<link rel="import" href="../../test-fixture/test-fixture.html">
</head>
<body>
@ -54,6 +52,22 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
}, 1);
});
test('can be unraised after being raised imperatively', function(done) {
button.raised = true;
expect(button.hasAttribute('raised')).to.be.eql(true);
Polymer.Base.async(function() {
expect(button.elevation).to.be.eql(1);
button.raised = false;
expect(button.hasAttribute('raised')).to.be.eql(false);
Polymer.Base.async(function() {
expect(button.elevation).to.be.eql(0);
done();
}, 1);
}, 1);
});
test('can be disabled imperatively', function() {
button.disabled = true;
expect(button.getAttribute('aria-disabled')).to.be.eql('true');
@ -85,7 +99,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
test('has aria role "button"', function() {
expect(button.getAttribute('role')).to.be.eql('button');
});
a11ySuite('TrivialButton');
});