From 783a1dfeba1c220b2a3a068da7c1339f75c54c00 Mon Sep 17 00:00:00 2001
From: "Adrien Minne (adrm)" <adrm@odoo.com>
Date: Wed, 18 Oct 2023 13:44:16 +0200
Subject: [PATCH] [FIX] spreadsheet: don't use constant uid in tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Most tests that need the user id simply use `uid=7`, which will fail
if the default user id ever change in the tests. This commit replaces
it by `sessuin.user_context.uid`.

closes odoo/odoo#138733

Task: 3553122
Related: odoo/enterprise#48965
Signed-off-by: Lucas Lefèvre (lul) <lul@odoo.com>
---
 .../static/tests/charts/model/odoo_chart_plugin_test.js       | 4 +++-
 addons/spreadsheet/static/tests/lists/list_plugin_test.js     | 3 ++-
 .../static/tests/pivots/model/pivot_plugin_test.js            | 3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/addons/spreadsheet/static/tests/charts/model/odoo_chart_plugin_test.js b/addons/spreadsheet/static/tests/charts/model/odoo_chart_plugin_test.js
index 367e11c76bc..3529032e24e 100644
--- a/addons/spreadsheet/static/tests/charts/model/odoo_chart_plugin_test.js
+++ b/addons/spreadsheet/static/tests/charts/model/odoo_chart_plugin_test.js
@@ -8,6 +8,7 @@ import { createSpreadsheetWithChart, insertChartInSpreadsheet } from "../../util
 import { createModelWithDataSource, waitForDataSourcesLoaded } from "../../utils/model";
 import * as spreadsheet from "@odoo/o-spreadsheet";
 import { makeServerError } from "@web/../tests/helpers/mock_server";
+import { session } from "@web/session";
 
 const { toZone } = spreadsheet.helpers;
 
@@ -216,6 +217,7 @@ QUnit.module("spreadsheet > odoo chart plugin", {}, () => {
 
     QUnit.test("can import (export) contextual domain", async function (assert) {
         const chartId = "1";
+        const uid = session.user_context.uid;
         const spreadsheetData = {
             sheets: [
                 {
@@ -251,7 +253,7 @@ QUnit.module("spreadsheet > odoo chart plugin", {}, () => {
             spreadsheetData,
             mockRPC: function (route, args) {
                 if (args.method === "web_read_group") {
-                    assert.deepEqual(args.kwargs.domain, [["foo", "=", 7]]);
+                    assert.deepEqual(args.kwargs.domain, [["foo", "=", uid]]);
                     assert.step("web_read_group");
                 }
             },
diff --git a/addons/spreadsheet/static/tests/lists/list_plugin_test.js b/addons/spreadsheet/static/tests/lists/list_plugin_test.js
index 577ed8af7d6..74c44bca15e 100644
--- a/addons/spreadsheet/static/tests/lists/list_plugin_test.js
+++ b/addons/spreadsheet/static/tests/lists/list_plugin_test.js
@@ -583,6 +583,7 @@ QUnit.module("spreadsheet > list plugin", {}, () => {
     );
 
     QUnit.test("can import (export) contextual domain", async function (assert) {
+        const uid = session.user_context.uid;
         const spreadsheetData = {
             lists: {
                 1: {
@@ -598,7 +599,7 @@ QUnit.module("spreadsheet > list plugin", {}, () => {
             spreadsheetData,
             mockRPC: function (route, args) {
                 if (args.method === "search_read") {
-                    assert.deepEqual(args.kwargs.domain, [["foo", "=", 7]]);
+                    assert.deepEqual(args.kwargs.domain, [["foo", "=", uid]]);
                     assert.step("search_read");
                 }
             },
diff --git a/addons/spreadsheet/static/tests/pivots/model/pivot_plugin_test.js b/addons/spreadsheet/static/tests/pivots/model/pivot_plugin_test.js
index e90db5a219b..3f217acab09 100644
--- a/addons/spreadsheet/static/tests/pivots/model/pivot_plugin_test.js
+++ b/addons/spreadsheet/static/tests/pivots/model/pivot_plugin_test.js
@@ -537,6 +537,7 @@ QUnit.module("spreadsheet > pivot plugin", {}, () => {
     });
 
     QUnit.test("can import (export) contextual domain", async (assert) => {
+        const uid = session.user_context.uid;
         const spreadsheetData = {
             pivots: {
                 1: {
@@ -554,7 +555,7 @@ QUnit.module("spreadsheet > pivot plugin", {}, () => {
             spreadsheetData,
             mockRPC: function (route, args) {
                 if (args.method === "read_group") {
-                    assert.deepEqual(args.kwargs.domain, [["foo", "=", 7]]);
+                    assert.deepEqual(args.kwargs.domain, [["foo", "=", uid]]);
                     assert.step("read_group");
                 }
             },