@@ -18,7 +18,7 @@ import {
1818 unMerge ,
1919} from "../test_helpers/commands_helpers" ;
2020import { getCellContent , getCellError , getEvaluatedCell } from "../test_helpers/getters_helpers" ;
21- import { restoreDefaultFunctions } from "../test_helpers/helpers" ;
21+ import { restoreDefaultFunctions , toCellPosition } from "../test_helpers/helpers" ;
2222
2323let model : Model ;
2424let sheetId : UID ;
@@ -250,18 +250,25 @@ describe("evaluate formulas that return an array", () => {
250250
251251 describe ( "result array can collides with other cell" , ( ) => {
252252 test ( "throw error on the formula when collide with cell having content" , ( ) => {
253+ const sheetId = model . getters . getActiveSheetId ( ) ;
253254 setCellContent ( model , "B2" , "kikou" ) ;
254255 setCellContent ( model , "A1" , "=MFILL(2,2, 42)" ) ;
255256 expect ( getEvaluatedCell ( model , "A1" ) . value ) . toBe ( "#SPILL!" ) ;
256257 expect ( getCellError ( model , "A1" ) ) . toBe (
257- "Array result was not expanded because it would overwrite data in B2."
258+ "Array result was not expanded because it would overwrite data."
259+ ) ;
260+ expect ( getEvaluatedCell ( model , "A1" ) . errorOriginPosition ) . toStrictEqual (
261+ toCellPosition ( sheetId , "B2" )
258262 ) ;
259263
260264 setCellContent ( model , "A4" , "kikou" ) ;
261265 setCellContent ( model , "A3" , "=MFILL(2,2, 42)" ) ;
262266 expect ( getEvaluatedCell ( model , "A3" ) . value ) . toBe ( "#SPILL!" ) ;
263267 expect ( getCellError ( model , "A3" ) ) . toBe (
264- "Array result was not expanded because it would overwrite data in A4."
268+ "Array result was not expanded because it would overwrite data."
269+ ) ;
270+ expect ( getEvaluatedCell ( model , "A1" ) . errorOriginPosition ) . toStrictEqual (
271+ toCellPosition ( sheetId , "B2" )
265272 ) ;
266273 } ) ;
267274
@@ -270,7 +277,10 @@ describe("evaluate formulas that return an array", () => {
270277 setCellContent ( model , "A1" , "=MFILL(2,2, 42)" ) ;
271278 expect ( getEvaluatedCell ( model , "A1" ) . value ) . toBe ( "#SPILL!" ) ;
272279 expect ( getCellError ( model , "A1" ) ) . toBe (
273- "Array result was not expanded because it would overwrite data in B2."
280+ "Array result was not expanded because it would overwrite data."
281+ ) ;
282+ expect ( getEvaluatedCell ( model , "A1" ) . errorOriginPosition ) . toStrictEqual (
283+ toCellPosition ( sheetId , "B2" )
274284 ) ;
275285 expect ( getEvaluatedCell ( model , "A2" ) . value ) . toBe ( null ) ;
276286 expect ( getEvaluatedCell ( model , "B1" ) . value ) . toBe ( null ) ;
@@ -283,7 +293,10 @@ describe("evaluate formulas that return an array", () => {
283293 setCellContent ( model , "A3" , "kikou" ) ;
284294 expect ( getEvaluatedCell ( model , "A1" ) . value ) . toBe ( "#SPILL!" ) ;
285295 expect ( getCellError ( model , "A1" ) ) . toBe (
286- "Array result was not expanded because it would overwrite data in A2."
296+ "Array result was not expanded because it would overwrite data."
297+ ) ;
298+ expect ( getEvaluatedCell ( model , "A1" ) . errorOriginPosition ) . toStrictEqual (
299+ toCellPosition ( sheetId , "A2" )
287300 ) ;
288301 } ) ;
289302
@@ -293,7 +306,10 @@ describe("evaluate formulas that return an array", () => {
293306 setCellContent ( model , "C1" , "kikou" ) ;
294307 expect ( getEvaluatedCell ( model , "A1" ) . value ) . toBe ( "#SPILL!" ) ;
295308 expect ( getCellError ( model , "A1" ) ) . toBe (
296- "Array result was not expanded because it would overwrite data in B1."
309+ "Array result was not expanded because it would overwrite data."
310+ ) ;
311+ expect ( getEvaluatedCell ( model , "A1" ) . errorOriginPosition ) . toStrictEqual (
312+ toCellPosition ( sheetId , "B1" )
297313 ) ;
298314 } ) ;
299315
@@ -818,7 +834,10 @@ describe("evaluate formulas that return an array", () => {
818834 expect ( getEvaluatedCell ( model , "B1" ) . value ) . toBe ( 42 ) ;
819835 expect ( getEvaluatedCell ( model , "A2" ) . value ) . toBe ( "#SPILL!" ) ;
820836 expect ( getCellError ( model , "A2" ) ) . toBe (
821- "Array result was not expanded because it would overwrite data in B2."
837+ "Array result was not expanded because it would overwrite data."
838+ ) ;
839+ expect ( getEvaluatedCell ( model , "A2" ) . errorOriginPosition ) . toStrictEqual (
840+ toCellPosition ( sheetId , "B2" )
822841 ) ;
823842 } ) ;
824843
@@ -828,7 +847,10 @@ describe("evaluate formulas that return an array", () => {
828847 expect ( getEvaluatedCell ( model , "B1" ) . value ) . toBe ( "#SPILL!" ) ;
829848 expect ( getEvaluatedCell ( model , "A2" ) . value ) . toBe ( 42 ) ;
830849 expect ( getCellError ( model , "B1" ) ) . toBe (
831- "Array result was not expanded because it would overwrite data in B2."
850+ "Array result was not expanded because it would overwrite data."
851+ ) ;
852+ expect ( getEvaluatedCell ( model , "B1" ) . errorOriginPosition ) . toStrictEqual (
853+ toCellPosition ( sheetId , "B2" )
832854 ) ;
833855 } ) ;
834856
@@ -838,7 +860,10 @@ describe("evaluate formulas that return an array", () => {
838860 expect ( getEvaluatedCell ( model , "B1" ) . value ) . toBe ( "#SPILL!" ) ;
839861 expect ( getEvaluatedCell ( model , "A2" ) . value ) . toBe ( 42 ) ;
840862 expect ( getCellError ( model , "B1" ) ) . toBe (
841- "Array result was not expanded because it would overwrite data in B2."
863+ "Array result was not expanded because it would overwrite data."
864+ ) ;
865+ expect ( getEvaluatedCell ( model , "B1" ) . errorOriginPosition ) . toStrictEqual (
866+ toCellPosition ( sheetId , "B2" )
842867 ) ;
843868 } ) ;
844869
0 commit comments