summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--addons/hr_org_chart/static/tests/hr_org_chart_tests.js2
-rw-r--r--addons/web/static/tests/fields/basic_fields_mobile_tests.js10
-rw-r--r--addons/web/views/webclient_templates.xml4
-rw-r--r--addons/website/static/src/img/blocks/twitter_scroll.pngbin0 -> 2388 bytes
4 files changed, 9 insertions, 7 deletions
diff --git a/addons/hr_org_chart/static/tests/hr_org_chart_tests.js b/addons/hr_org_chart/static/tests/hr_org_chart_tests.js
index a6041e25dcd..d5a546b324b 100644
--- a/addons/hr_org_chart/static/tests/hr_org_chart_tests.js
+++ b/addons/hr_org_chart/static/tests/hr_org_chart_tests.js
@@ -77,6 +77,7 @@ QUnit.module('hr_org_chart', {
job_name: 'Sub-Gooroo',
link: 'fake_link',
name: 'Michael Hawkins',
+ id: 2,
}],
managers: [],
managers_more: false,
@@ -129,6 +130,7 @@ QUnit.module('hr_org_chart', {
job_name: 'Sub-Gooroo',
link: 'fake_link',
name: 'Michael Hawkins',
+ id: 2,
}],
managers: [{
direct_sub_count: 1,
diff --git a/addons/web/static/tests/fields/basic_fields_mobile_tests.js b/addons/web/static/tests/fields/basic_fields_mobile_tests.js
index 76482a71e83..acd9cebc989 100644
--- a/addons/web/static/tests/fields/basic_fields_mobile_tests.js
+++ b/addons/web/static/tests/fields/basic_fields_mobile_tests.js
@@ -1,4 +1,4 @@
-odoo.define('web.basic_fields_tests', function (require) {
+odoo.define('web.basic_fields_mobile_tests', function (require) {
"use strict";
var FormView = require('web.FormView');
@@ -109,13 +109,13 @@ QUnit.module('basic_fields', {
arch: '<tree editable="bottom"><field name="foo" widget="phone"/></tree>',
});
- assert.strictEqual(list.$('tbody td:not(.o_list_record_selector)').length, 5,
- "should have 5 cells");
+ assert.strictEqual(list.$('.o_data_row').length, 3,
+ "should have 3 record");
assert.strictEqual(list.$('tbody td:not(.o_list_record_selector)').first().text(), 'yop',
"value should be displayed properly");
var $phoneLink = list.$('a.o_form_uri.o_field_widget');
- assert.strictEqual($phoneLink.length, 5,
+ assert.strictEqual($phoneLink.length, 3,
"should have anchors with correct classes");
assert.strictEqual($phoneLink.first().attr('href'), 'tel:yop',
"should have proper tel prefix");
@@ -135,7 +135,7 @@ QUnit.module('basic_fields', {
assert.strictEqual(list.$('tbody td:not(.o_list_record_selector)').first().text(), 'new',
"value should be properly updated");
$phoneLink = list.$('a.o_form_uri.o_field_widget');
- assert.strictEqual($phoneLink.length, 5,
+ assert.strictEqual($phoneLink.length, 3,
"should still have anchors with correct classes");
assert.strictEqual($phoneLink.first().attr('href'), 'tel:new',
"should still have proper tel prefix");
diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml
index eb05c51af9f..49f056a2339 100644
--- a/addons/web/views/webclient_templates.xml
+++ b/addons/web/views/webclient_templates.xml
@@ -642,8 +642,8 @@
<script type="text/javascript" src="/web/static/tests/views/calendar_mobile_tests.js"></script>
<script type="text/javascript" src="/web/static/tests/views/kanban_mobile_tests.js"></script>
<script type="text/javascript" src="/web/static/tests/views/form_mobile_tests.js"></script>
- <script type="text/javascript" src="/web/static/tests/views/basic_fields_mobile_tests.js"></script>
- <script type="text/javascript" src="/web/static/tests/views/relational_fields_mobile_tests.js"></script>
+ <script type="text/javascript" src="/web/static/tests/fields/basic_fields_mobile_tests.js"></script>
+ <script type="text/javascript" src="/web/static/tests/fields/relational_fields_mobile_tests.js"></script>
</t>
<div id="qunit"/>
diff --git a/addons/website/static/src/img/blocks/twitter_scroll.png b/addons/website/static/src/img/blocks/twitter_scroll.png
new file mode 100644
index 00000000000..b8d602d519a
--- /dev/null
+++ b/addons/website/static/src/img/blocks/twitter_scroll.png
Binary files differ