Skip to content

Commit

Permalink
Merge branch 'feature/PB-30323_Bump-styleguide-version-to-461' into '…
Browse files Browse the repository at this point in the history
…release'

PB-30323: bump styleguide version to 4.6.1

See merge request passbolt/passbolt-browser-extension!773
  • Loading branch information
cedricalfonsi committed Mar 12, 2024
2 parents 7fccd7c + 887ee79 commit b5416bd
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"locutus": "~2.0.9",
"openpgp": "^5.11.1",
"papaparse": "^5.2.0",
"passbolt-styleguide": "^4.6.0",
"passbolt-styleguide": "^4.6.1",
"react": "17.0.2",
"react-dom": "17.0.2",
"secrets-passbolt": "github:passbolt/secrets.js#v2.0.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ describe("GetResourceColumnsSettingController", () => {

it("Should retrieve the resource columns settings.", async() => {
const mockedAccount = {id: uuid()};
const columnsSetting = [{id: "name"}];
const columnsSetting = [{id: "name", label: "name"}];
const sorter = {propertyName: "name", asc: true};
const gridUserSetting = {columns_setting: columnsSetting, sorter: sorter};
jest.spyOn(browser.storage.local, "get").mockImplementationOnce(() => ({[`${RESOURCE_GRID_USER_SETTING_STORAGE_KEY}-${mockedAccount.id}`]: gridUserSetting}));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ describe("SetResourceColumnsSettingController", () => {
it("Should update the resource columns settings in the local storage.", async() => {
expect.assertions(1);
const mockedAccount = {id: uuid()};
const columnsSetting = [{id: "name"}];
const columnsSetting = [{id: "name", label: "name"}];
const sorter = {propertyName: "name", asc: true};
const gridUserSetting = {columns_setting: columnsSetting, sorter: sorter};
jest.spyOn(browser.storage.local, "set");
Expand Down

0 comments on commit b5416bd

Please sign in to comment.