Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'develop' of github.com:martini/zammad into develop

Browse source
This commit is contained in:
Felix Niklas 2016-02-16 09:30:36 +01:00
commit fa8fd5698f
18 changed files with 4297 additions and 2074 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/views/tests/core.html.erb
View file

@ -1,6 +1,6 @@
<link rel="stylesheet" href="/assets/tests/qunit-1.10.0.css"> <link rel="stylesheet" href="/assets/tests/qunit-1.21.0.css">
<script src="/assets/tests/qunit-1.10.0.js"></script> <script src="/assets/tests/qunit-1.21.0.js"></script>
<script src="/assets/tests/core.js"></script> <script src="/assets/tests/core.js"></script>
<style type="text/css"> <style type="text/css">

4
app/views/tests/form.html.erb
View file

@ -1,6 +1,6 @@
<link rel="stylesheet" href="/assets/tests/qunit-1.10.0.css"> <link rel="stylesheet" href="/assets/tests/qunit-1.21.0.css">
<script src="/assets/tests/qunit-1.10.0.js"></script> <script src="/assets/tests/qunit-1.21.0.js"></script>
<script src="/assets/tests/form.js"></script> <script src="/assets/tests/form.js"></script>
<style type="text/css"> <style type="text/css">

4
app/views/tests/form_column_select.html.erb
View file

@ -1,6 +1,6 @@
<link rel="stylesheet" href="/assets/tests/qunit-1.10.0.css"> <link rel="stylesheet" href="/assets/tests/qunit-1.21.0.css">
<script src="/assets/tests/qunit-1.10.0.js"></script> <script src="/assets/tests/qunit-1.21.0.js"></script>
<script src="/assets/tests/form_column_select.js"></script> <script src="/assets/tests/form_column_select.js"></script>
<style type="text/css"> <style type="text/css">

4
app/views/tests/form_extended.html.erb
View file

@ -1,6 +1,6 @@
<link rel="stylesheet" href="/assets/tests/qunit-1.10.0.css"> <link rel="stylesheet" href="/assets/tests/qunit-1.21.0.css">
<script src="/assets/tests/qunit-1.10.0.js"></script> <script src="/assets/tests/qunit-1.21.0.js"></script>
<script src="/assets/tests/form_extended.js"></script> <script src="/assets/tests/form_extended.js"></script>
<style type="text/css"> <style type="text/css">

4
app/views/tests/form_find.html.erb
View file

@ -1,6 +1,6 @@
<link rel="stylesheet" href="/assets/tests/qunit-1.10.0.css"> <link rel="stylesheet" href="/assets/tests/qunit-1.21.0.css">
<script src="/assets/tests/qunit-1.10.0.js"></script> <script src="/assets/tests/qunit-1.21.0.js"></script>
<script src="/assets/tests/form_find.js"></script> <script src="/assets/tests/form_find.js"></script>
<style type="text/css"> <style type="text/css">

4
app/views/tests/form_searchable_select.html.erb
View file

@ -1,6 +1,6 @@
<link rel="stylesheet" href="/assets/tests/qunit-1.10.0.css"> <link rel="stylesheet" href="/assets/tests/qunit-1.21.0.css">
<script src="/assets/tests/qunit-1.10.0.js"></script> <script src="/assets/tests/qunit-1.21.0.js"></script>
<script src="/assets/tests/form_searchable_select.js"></script> <script src="/assets/tests/form_searchable_select.js"></script>
<style type="text/css"> <style type="text/css">

4
app/views/tests/form_trim.html.erb
View file

@ -1,6 +1,6 @@
<link rel="stylesheet" href="/assets/tests/qunit-1.10.0.css"> <link rel="stylesheet" href="/assets/tests/qunit-1.21.0.css">
<script src="/assets/tests/qunit-1.10.0.js"></script> <script src="/assets/tests/qunit-1.21.0.js"></script>
<script src="/assets/tests/form_trim.js"></script> <script src="/assets/tests/form_trim.js"></script>
<style type="text/css"> <style type="text/css">

5
app/views/tests/form_validation.html.erb
View file

@ -1,5 +1,6 @@
<link rel="stylesheet" href="/assets/tests/qunit-1.10.0.css">
<script src="/assets/tests/qunit-1.10.0.js"></script> <link rel="stylesheet" href="/assets/tests/qunit-1.21.0.css">
<script src="/assets/tests/qunit-1.21.0.js"></script>
<script src="/assets/tests/form_validation.js"></script> <script src="/assets/tests/form_validation.js"></script>
<style type="text/css"> <style type="text/css">

4
app/views/tests/html_utils.html.erb
View file

@ -1,6 +1,6 @@
<link rel="stylesheet" href="/assets/tests/qunit-1.10.0.css"> <link rel="stylesheet" href="/assets/tests/qunit-1.21.0.css">
<script src="/assets/tests/qunit-1.10.0.js"></script> <script src="/assets/tests/qunit-1.21.0.js"></script>
<script src="/assets/tests/html_utils.js"></script> <script src="/assets/tests/html_utils.js"></script>
<style type="text/css"> <style type="text/css">

4
app/views/tests/model.html.erb
View file

@ -1,6 +1,6 @@
<link rel="stylesheet" href="/assets/tests/qunit-1.10.0.css"> <link rel="stylesheet" href="/assets/tests/qunit-1.21.0.css">
<script src="/assets/tests/qunit-1.10.0.js"></script> <script src="/assets/tests/qunit-1.21.0.js"></script>
<script src="/assets/tests/model.js"></script> <script src="/assets/tests/model.js"></script>
<style type="text/css"> <style type="text/css">

4
app/views/tests/model_ui.html.erb
View file

@ -1,6 +1,6 @@
<link rel="stylesheet" href="/assets/tests/qunit-1.10.0.css"> <link rel="stylesheet" href="/assets/tests/qunit-1.21.0.css">
<script src="/assets/tests/qunit-1.10.0.js"></script> <script src="/assets/tests/qunit-1.21.0.js"></script>
<script src="/assets/tests/model_ui.js"></script> <script src="/assets/tests/model_ui.js"></script>
<style type="text/css"> <style type="text/css">

4
app/views/tests/table.html.erb
View file

@ -1,6 +1,6 @@
<link rel="stylesheet" href="/assets/tests/qunit-1.10.0.css"> <link rel="stylesheet" href="/assets/tests/qunit-1.21.0.css">
<script src="/assets/tests/qunit-1.10.0.js"></script> <script src="/assets/tests/qunit-1.21.0.js"></script>
<script src="/assets/tests/table.js"></script> <script src="/assets/tests/table.js"></script>
<style type="text/css"> <style type="text/css">

5
app/views/tests/taskbar.html.erb
View file

@ -1,5 +1,6 @@
<link rel="stylesheet" href="/assets/tests/qunit-1.10.0.css">
<script src="/assets/tests/qunit-1.10.0.js"></script> <link rel="stylesheet" href="/assets/tests/qunit-1.21.0.css">
<script src="/assets/tests/qunit-1.21.0.js"></script>
<script src="/assets/tests/taskbar.js"></script> <script src="/assets/tests/taskbar.js"></script>
<style type="text/css"> <style type="text/css">

4
app/views/tests/ui.html.erb
View file

@ -1,6 +1,6 @@
<link rel="stylesheet" href="/assets/tests/qunit-1.10.0.css"> <link rel="stylesheet" href="/assets/tests/qunit-1.21.0.css">
<script src="/assets/tests/qunit-1.10.0.js"></script> <script src="/assets/tests/qunit-1.21.0.js"></script>
<script src="/assets/tests/ui.js"></script> <script src="/assets/tests/ui.js"></script>
<style type="text/css"> <style type="text/css">

37
public/assets/tests/form_column_select.js
View file

@ -1,7 +1,6 @@
// column_select // column_select
test( "column_select check", function() { test( "column_select check", function(assert) {
$('#forms').append('<hr><h1>column_select check</h1><form id="form1"></form>') $('#forms').append('<hr><h1>column_select check</h1><form id="form1"></form>')
var el = $('#form1') var el = $('#form1')
var defaults = { var defaults = {
@ -13,8 +12,8 @@ test( "column_select check", function() {
'ccc': 'ccc display', 'ccc': 'ccc display',
} }
new App.ControllerForm({ new App.ControllerForm({
el: el, el: el,
model: { model: {
configure_attributes: [ configure_attributes: [
{ name: 'column_select1', display: 'ColumnSelect1', tag: 'column_select', options: options, null: true, default: defaults['column_select1'] }, { name: 'column_select1', display: 'ColumnSelect1', tag: 'column_select', options: options, null: true, default: defaults['column_select1'] },
{ name: 'column_select2', display: 'ColumnSelect2', tag: 'column_select', options: options, null: false, default: defaults['column_select2'] }, { name: 'column_select2', display: 'ColumnSelect2', tag: 'column_select', options: options, null: false, default: defaults['column_select2'] },
@ -23,31 +22,35 @@ test( "column_select check", function() {
autofocus: true autofocus: true
}) })
var params = App.ControllerForm.params( el ) var params = App.ControllerForm.params(el)
var test_params = { var test_params = {
column_select2: ['aaa', 'bbb'], column_select2: ['aaa', 'bbb'],
} }
deepEqual( params, test_params, 'form param check' ) deepEqual(params, test_params, 'form param check')
// add and remove selections // add and remove selections
$('[data-name="column_select1"] .js-pool .js-option[data-value="bbb"]').click() $('[data-name="column_select1"] .js-pool .js-option[data-value="bbb"]').click()
params = App.ControllerForm.params( el ) params = App.ControllerForm.params(el)
test_params = { test_params = {
column_select1: 'bbb', column_select1: 'bbb',
column_select2: ['aaa', 'bbb'], column_select2: ['aaa', 'bbb'],
} }
deepEqual( params, test_params, 'form param check' ) deepEqual(params, test_params, 'form param check')
$('[data-name="column_select1"] .js-pool .js-option[data-value="aaa"]').click() var done = assert.async();
$('[data-name="column_select2"] .js-pool .js-option[data-value="ccc"]').click() setTimeout(function() {
$('[data-name="column_select2"].js-selected .js-option[data-value="aaa"]').click() $('[data-name="column_select1"] .js-pool .js-option[data-value="aaa"]').click()
$('[data-name="column_select2"] .js-pool .js-option[data-value="ccc"]').click()
$('[data-name="column_select2"].js-selected .js-option[data-value="aaa"]').click()
params = App.ControllerForm.params( el ) params = App.ControllerForm.params(el)
test_params = { test_params = {
column_select1: ['aaa', 'bbb'], column_select1: ['aaa', 'bbb'],
column_select2: ['bbb', 'ccc'], column_select2: ['bbb', 'ccc'],
} }
deepEqual( params, test_params, 'form param check' ) deepEqual(params, test_params, 'form param check')
done();
}, 400);
}); });

1977
public/assets/tests/qunit-1.10.0.js
View file

File diff suppressed because it is too large Load diff

174
public/assets/tests/qunit-1.10.0.css → public/assets/tests/qunit-1.21.0.css
View file

@ -1,26 +1,27 @@
/** /*!
* QUnit v1.10.0 - A JavaScript Unit Testing Framework * QUnit 1.21.0
* https://qunitjs.com/
* *
* http://qunitjs.com * Copyright jQuery Foundation and other contributors
* Released under the MIT license
* https://jquery.org/license
* *
* Copyright 2012 jQuery Foundation and other contributors * Date: 2016-02-01T13:07Z
* Released under the MIT license.
* http://jquery.org/license
*/ */
/** Font Family and Sizes */ /** Font Family and Sizes */
#qunit-tests, #qunit-header, #qunit-banner, #qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult { #qunit-tests, #qunit-header, #qunit-banner, #qunit-testrunner-toolbar, #qunit-filteredTest, #qunit-userAgent, #qunit-testresult {
font-family: "Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial, sans-serif; font-family: "Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial, sans-serif;
} }
#qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult, #qunit-tests li { font-size: small; } #qunit-testrunner-toolbar, #qunit-filteredTest, #qunit-userAgent, #qunit-testresult, #qunit-tests li { font-size: small; }
#qunit-tests { font-size: smaller; } #qunit-tests { font-size: smaller; }
/** Resets */ /** Resets */
#qunit-tests, #qunit-tests ol, #qunit-header, #qunit-banner, #qunit-userAgent, #qunit-testresult, #qunit-modulefilter { #qunit-tests, #qunit-header, #qunit-banner, #qunit-filteredTest, #qunit-userAgent, #qunit-testresult, #qunit-modulefilter {
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
@ -31,32 +32,29 @@
#qunit-header { #qunit-header {
padding: 0.5em 0 0.5em 1em; padding: 0.5em 0 0.5em 1em;
color: #8699a4; color: #8699A4;
background-color: #0d3349; background-color: #0D3349;
font-size: 1.5em; font-size: 1.5em;
line-height: 1em; line-height: 1em;
font-weight: normal; font-weight: 400;
border-radius: 5px 5px 0 0; border-radius: 5px 5px 0 0;
-moz-border-radius: 5px 5px 0 0;
-webkit-border-top-right-radius: 5px;
-webkit-border-top-left-radius: 5px;
} }
#qunit-header a { #qunit-header a {
text-decoration: none; text-decoration: none;
color: #c2ccd1; color: #C2CCD1;
} }
#qunit-header a:hover, #qunit-header a:hover,
#qunit-header a:focus { #qunit-header a:focus {
color: #fff; color: #FFF;
} }
#qunit-testrunner-toolbar label { #qunit-testrunner-toolbar label {
display: inline-block; display: inline-block;
padding: 0 .5em 0 .1em; padding: 0 0.5em 0 0.1em;
} }
#qunit-banner { #qunit-banner {
@ -64,21 +62,39 @@
} }
#qunit-testrunner-toolbar { #qunit-testrunner-toolbar {
padding: 0.5em 0 0.5em 2em; padding: 0.5em 1em 0.5em 1em;
color: #5E740B; color: #5E740B;
background-color: #eee; background-color: #EEE;
overflow: hidden; overflow: hidden;
} }
#qunit-filteredTest {
padding: 0.5em 1em 0.5em 1em;
background-color: #F4FF77;
color: #366097;
}
#qunit-userAgent { #qunit-userAgent {
padding: 0.5em 0 0.5em 2.5em; padding: 0.5em 1em 0.5em 1em;
background-color: #2b81af; background-color: #2B81AF;
color: #fff; color: #FFF;
text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px; text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px;
} }
#qunit-modulefilter-container { #qunit-modulefilter-container {
float: right; float: right;
padding: 0.2em;
}
.qunit-url-config {
display: inline-block;
padding: 0.1em;
}
.qunit-filter {
display: block;
float: right;
margin-left: 1em;
} }
/** Tests: Pass/Fail */ /** Tests: Pass/Fail */
@ -88,49 +104,91 @@
} }
#qunit-tests li { #qunit-tests li {
padding: 0.4em 0.5em 0.4em 2.5em; padding: 0.4em 1em 0.4em 1em;
border-bottom: 1px solid #fff; border-bottom: 1px solid #FFF;
list-style-position: inside; list-style-position: inside;
} }
#qunit-tests.hidepass li.pass, #qunit-tests.hidepass li.running { #qunit-tests > li {
display: none; display: none;
} }
#qunit-tests li.running,
#qunit-tests li.pass,
#qunit-tests li.fail,
#qunit-tests li.skipped {
display: list-item;
}
#qunit-tests.hidepass {
position: relative;
}
#qunit-tests.hidepass li.running,
#qunit-tests.hidepass li.pass {
visibility: hidden;
position: absolute;
width: 0;
height: 0;
padding: 0;
border: 0;
margin: 0;
}
#qunit-tests li strong { #qunit-tests li strong {
cursor: pointer; cursor: pointer;
} }
#qunit-tests li.skipped strong {
cursor: default;
}
#qunit-tests li a { #qunit-tests li a {
padding: 0.5em; padding: 0.5em;
color: #c2ccd1; color: #C2CCD1;
text-decoration: none; text-decoration: none;
} }
#qunit-tests li p a {
padding: 0.25em;
color: #6B6464;
}
#qunit-tests li a:hover, #qunit-tests li a:hover,
#qunit-tests li a:focus { #qunit-tests li a:focus {
color: #000; color: #000;
} }
#qunit-tests ol { #qunit-tests li .runtime {
float: right;
font-size: smaller;
}
.qunit-assert-list {
margin-top: 0.5em; margin-top: 0.5em;
padding: 0.5em; padding: 0.5em;
background-color: #fff; background-color: #FFF;
border-radius: 5px; border-radius: 5px;
-moz-border-radius: 5px; }
-webkit-border-radius: 5px;
.qunit-source {
margin: 0.6em 0 0.3em;
}
.qunit-collapsed {
display: none;
} }
#qunit-tests table { #qunit-tests table {
border-collapse: collapse; border-collapse: collapse;
margin-top: .2em; margin-top: 0.2em;
} }
#qunit-tests th { #qunit-tests th {
text-align: right; text-align: right;
vertical-align: top; vertical-align: top;
padding: 0 .5em 0 0; padding: 0 0.5em 0 0;
} }
#qunit-tests td { #qunit-tests td {
@ -144,26 +202,26 @@
} }
#qunit-tests del { #qunit-tests del {
background-color: #e0f2be; background-color: #E0F2BE;
color: #374e0c; color: #374E0C;
text-decoration: none; text-decoration: none;
} }
#qunit-tests ins { #qunit-tests ins {
background-color: #ffcaca; background-color: #FFCACA;
color: #500; color: #500;
text-decoration: none; text-decoration: none;
} }
/*** Test Counts */ /*** Test Counts */
#qunit-tests b.counts { color: black; } #qunit-tests b.counts { color: #000; }
#qunit-tests b.passed { color: #5E740B; } #qunit-tests b.passed { color: #5E740B; }
#qunit-tests b.failed { color: #710909; } #qunit-tests b.failed { color: #710909; }
#qunit-tests li li { #qunit-tests li li {
padding: 5px; padding: 5px;
background-color: #fff; background-color: #FFF;
border-bottom: none; border-bottom: none;
list-style-position: inside; list-style-position: inside;
} }
@ -171,8 +229,8 @@
/*** Passing Styles */ /*** Passing Styles */
#qunit-tests li li.pass { #qunit-tests li li.pass {
color: #3c510c; color: #3C510C;
background-color: #fff; background-color: #FFF;
border-left: 10px solid #C6E746; border-left: 10px solid #C6E746;
} }
@ -180,7 +238,7 @@
#qunit-tests .pass .test-name { color: #366097; } #qunit-tests .pass .test-name { color: #366097; }
#qunit-tests .pass .test-actual, #qunit-tests .pass .test-actual,
#qunit-tests .pass .test-expected { color: #999999; } #qunit-tests .pass .test-expected { color: #999; }
#qunit-banner.qunit-pass { background-color: #C6E746; } #qunit-banner.qunit-pass { background-color: #C6E746; }
@ -188,40 +246,52 @@
#qunit-tests li li.fail { #qunit-tests li li.fail {
color: #710909; color: #710909;
background-color: #fff; background-color: #FFF;
border-left: 10px solid #EE5757; border-left: 10px solid #EE5757;
white-space: pre; white-space: pre;
} }
#qunit-tests > li:last-child { #qunit-tests > li:last-child {
border-radius: 0 0 5px 5px; border-radius: 0 0 5px 5px;
-moz-border-radius: 0 0 5px 5px;
-webkit-border-bottom-right-radius: 5px;
-webkit-border-bottom-left-radius: 5px;
} }
#qunit-tests .fail { color: #000000; background-color: #EE5757; } #qunit-tests .fail { color: #000; background-color: #EE5757; }
#qunit-tests .fail .test-name, #qunit-tests .fail .test-name,
#qunit-tests .fail .module-name { color: #000000; } #qunit-tests .fail .module-name { color: #000; }
#qunit-tests .fail .test-actual { color: #EE5757; } #qunit-tests .fail .test-actual { color: #EE5757; }
#qunit-tests .fail .test-expected { color: green; } #qunit-tests .fail .test-expected { color: #008000; }
#qunit-banner.qunit-fail { background-color: #EE5757; } #qunit-banner.qunit-fail { background-color: #EE5757; }
/*** Skipped tests */
#qunit-tests .skipped {
background-color: #EBECE9;
}
#qunit-tests .qunit-skipped-label {
background-color: #F4FF77;
display: inline-block;
font-style: normal;
color: #366097;
line-height: 1.8em;
padding: 0 0.5em;
margin: -0.4em 0.4em -0.4em 0;
}
/** Result */ /** Result */
#qunit-testresult { #qunit-testresult {
padding: 0.5em 0.5em 0.5em 2.5em; padding: 0.5em 1em 0.5em 1em;
color: #2b81af; color: #2B81AF;
background-color: #D2E0E6; background-color: #D2E0E6;
border-bottom: 1px solid white; border-bottom: 1px solid #FFF;
} }
#qunit-testresult .module-name { #qunit-testresult .module-name {
font-weight: bold; font-weight: 700;
} }
/** Fixture */ /** Fixture */

4125
public/assets/tests/qunit-1.21.0.js Normal file
View file

File diff suppressed because it is too large Load diff