@@ -18,7 +18,7 @@ import {
1818 unMerge ,
1919} from "../test_helpers/commands_helpers" ;
2020import { getCellContent , getCellError , getEvaluatedCell } from "../test_helpers/getters_helpers" ;
21- import { addToRegistry } from "../test_helpers/helpers" ;
21+ import { addToRegistry , toCellPosition } from "../test_helpers/helpers" ;
2222
2323let model : Model ;
2424let sheetId : UID ;
@@ -246,18 +246,25 @@ describe("evaluate formulas that return an array", () => {
246246
247247 describe ( "result array can collides with other cell" , ( ) => {
248248 test ( "throw error on the formula when collide with cell having content" , ( ) => {
249+ const sheetId = model . getters . getActiveSheetId ( ) ;
249250 setCellContent ( model , "B2" , "kikou" ) ;
250251 setCellContent ( model , "A1" , "=MFILL(2,2, 42)" ) ;
251252 expect ( getEvaluatedCell ( model , "A1" ) . value ) . toBe ( "#SPILL!" ) ;
252253 expect ( getCellError ( model , "A1" ) ) . toBe (
253- "Array result was not expanded because it would overwrite data in B2."
254+ "Array result was not expanded because it would overwrite data."
255+ ) ;
256+ expect ( getEvaluatedCell ( model , "A1" ) . errorOriginPosition ) . toStrictEqual (
257+ toCellPosition ( sheetId , "B2" )
254258 ) ;
255259
256260 setCellContent ( model , "A4" , "kikou" ) ;
257261 setCellContent ( model , "A3" , "=MFILL(2,2, 42)" ) ;
258262 expect ( getEvaluatedCell ( model , "A3" ) . value ) . toBe ( "#SPILL!" ) ;
259263 expect ( getCellError ( model , "A3" ) ) . toBe (
260- "Array result was not expanded because it would overwrite data in A4."
264+ "Array result was not expanded because it would overwrite data."
265+ ) ;
266+ expect ( getEvaluatedCell ( model , "A1" ) . errorOriginPosition ) . toStrictEqual (
267+ toCellPosition ( sheetId , "B2" )
261268 ) ;
262269 } ) ;
263270
@@ -266,7 +273,10 @@ describe("evaluate formulas that return an array", () => {
266273 setCellContent ( model , "A1" , "=MFILL(2,2, 42)" ) ;
267274 expect ( getEvaluatedCell ( model , "A1" ) . value ) . toBe ( "#SPILL!" ) ;
268275 expect ( getCellError ( model , "A1" ) ) . toBe (
269- "Array result was not expanded because it would overwrite data in B2."
276+ "Array result was not expanded because it would overwrite data."
277+ ) ;
278+ expect ( getEvaluatedCell ( model , "A1" ) . errorOriginPosition ) . toStrictEqual (
279+ toCellPosition ( sheetId , "B2" )
270280 ) ;
271281 expect ( getEvaluatedCell ( model , "A2" ) . value ) . toBe ( null ) ;
272282 expect ( getEvaluatedCell ( model , "B1" ) . value ) . toBe ( null ) ;
@@ -279,7 +289,10 @@ describe("evaluate formulas that return an array", () => {
279289 setCellContent ( model , "A3" , "kikou" ) ;
280290 expect ( getEvaluatedCell ( model , "A1" ) . value ) . toBe ( "#SPILL!" ) ;
281291 expect ( getCellError ( model , "A1" ) ) . toBe (
282- "Array result was not expanded because it would overwrite data in A2."
292+ "Array result was not expanded because it would overwrite data."
293+ ) ;
294+ expect ( getEvaluatedCell ( model , "A1" ) . errorOriginPosition ) . toStrictEqual (
295+ toCellPosition ( sheetId , "A2" )
283296 ) ;
284297 } ) ;
285298
@@ -289,7 +302,10 @@ describe("evaluate formulas that return an array", () => {
289302 setCellContent ( model , "C1" , "kikou" ) ;
290303 expect ( getEvaluatedCell ( model , "A1" ) . value ) . toBe ( "#SPILL!" ) ;
291304 expect ( getCellError ( model , "A1" ) ) . toBe (
292- "Array result was not expanded because it would overwrite data in B1."
305+ "Array result was not expanded because it would overwrite data."
306+ ) ;
307+ expect ( getEvaluatedCell ( model , "A1" ) . errorOriginPosition ) . toStrictEqual (
308+ toCellPosition ( sheetId , "B1" )
293309 ) ;
294310 } ) ;
295311
@@ -814,7 +830,10 @@ describe("evaluate formulas that return an array", () => {
814830 expect ( getEvaluatedCell ( model , "B1" ) . value ) . toBe ( 42 ) ;
815831 expect ( getEvaluatedCell ( model , "A2" ) . value ) . toBe ( "#SPILL!" ) ;
816832 expect ( getCellError ( model , "A2" ) ) . toBe (
817- "Array result was not expanded because it would overwrite data in B2."
833+ "Array result was not expanded because it would overwrite data."
834+ ) ;
835+ expect ( getEvaluatedCell ( model , "A2" ) . errorOriginPosition ) . toStrictEqual (
836+ toCellPosition ( sheetId , "B2" )
818837 ) ;
819838 } ) ;
820839
@@ -824,7 +843,10 @@ describe("evaluate formulas that return an array", () => {
824843 expect ( getEvaluatedCell ( model , "B1" ) . value ) . toBe ( "#SPILL!" ) ;
825844 expect ( getEvaluatedCell ( model , "A2" ) . value ) . toBe ( 42 ) ;
826845 expect ( getCellError ( model , "B1" ) ) . toBe (
827- "Array result was not expanded because it would overwrite data in B2."
846+ "Array result was not expanded because it would overwrite data."
847+ ) ;
848+ expect ( getEvaluatedCell ( model , "B1" ) . errorOriginPosition ) . toStrictEqual (
849+ toCellPosition ( sheetId , "B2" )
828850 ) ;
829851 } ) ;
830852
@@ -834,7 +856,10 @@ describe("evaluate formulas that return an array", () => {
834856 expect ( getEvaluatedCell ( model , "B1" ) . value ) . toBe ( "#SPILL!" ) ;
835857 expect ( getEvaluatedCell ( model , "A2" ) . value ) . toBe ( 42 ) ;
836858 expect ( getCellError ( model , "B1" ) ) . toBe (
837- "Array result was not expanded because it would overwrite data in B2."
859+ "Array result was not expanded because it would overwrite data."
860+ ) ;
861+ expect ( getEvaluatedCell ( model , "B1" ) . errorOriginPosition ) . toStrictEqual (
862+ toCellPosition ( sheetId , "B2" )
838863 ) ;
839864 } ) ;
840865
0 commit comments