revert browser newux changes (#5714)

browser/app/js/objects/__tests__/ObjectActions.test.js

@@ -0,0 +1,95 @@
+/*
+ * Minio Cloud Storage (C) 2018 Minio, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React from "react"
+import { shallow } from "enzyme"
+import { ObjectActions } from "../ObjectActions"
+
+describe("ObjectActions", () => {
+  it("should render without crashing", () => {
+    shallow(<ObjectActions object={{ name: "obj1" }} currentPrefix={"pre1/"} />)
+  })
+
+  it("should show DeleteObjectConfirmModal when delete action is clicked", () => {
+    const wrapper = shallow(
+      <ObjectActions object={{ name: "obj1" }} currentPrefix={"pre1/"} />
+    )
+    wrapper
+      .find("a")
+      .last()
+      .simulate("click", { preventDefault: jest.fn() })
+    expect(wrapper.state("showDeleteConfirmation")).toBeTruthy()
+    expect(wrapper.find("DeleteObjectConfirmModal").length).toBe(1)
+  })
+
+  it("should hide DeleteObjectConfirmModal when Cancel button is clicked", () => {
+    const wrapper = shallow(
+      <ObjectActions object={{ name: "obj1" }} currentPrefix={"pre1/"} />
+    )
+    wrapper
+      .find("a")
+      .last()
+      .simulate("click", { preventDefault: jest.fn() })
+    wrapper.find("DeleteObjectConfirmModal").prop("hideDeleteConfirmModal")()
+    wrapper.update()
+    expect(wrapper.state("showDeleteConfirmation")).toBeFalsy()
+    expect(wrapper.find("DeleteObjectConfirmModal").length).toBe(0)
+  })
+
+  it("should call deleteObject with object name", () => {
+    const deleteObject = jest.fn()
+    const wrapper = shallow(
+      <ObjectActions
+        object={{ name: "obj1" }}
+        currentPrefix={"pre1/"}
+        deleteObject={deleteObject}
+      />
+    )
+    wrapper
+      .find("a")
+      .last()
+      .simulate("click", { preventDefault: jest.fn() })
+    wrapper.find("DeleteObjectConfirmModal").prop("deleteObject")()
+    expect(deleteObject).toHaveBeenCalledWith("obj1")
+  })
+
+  it("should call shareObject with object and expiry", () => {
+    const shareObject = jest.fn()
+    const wrapper = shallow(
+      <ObjectActions
+        object={{ name: "obj1" }}
+        currentPrefix={"pre1/"}
+        shareObject={shareObject}
+      />
+    )
+    wrapper
+      .find("a")
+      .first()
+      .simulate("click", { preventDefault: jest.fn() })
+    expect(shareObject).toHaveBeenCalledWith("obj1", 5, 0, 0)
+  })
+
+  it("should render ShareObjectModal when an object is shared", () => {
+    const wrapper = shallow(
+      <ObjectActions
+        object={{ name: "obj1" }}
+        currentPrefix={"pre1/"}
+        showShareObjectModal={true}
+      />
+    )
+    expect(wrapper.find("Connect(ShareObjectModal)").length).toBe(1)
+  })
+})

browser/app/js/objects/__tests__/ObjectContainer.test.js

@@ -28,4 +28,22 @@ describe("ObjectContainer", () => {
     expect(wrapper.find("Connect(ObjectItem)").length).toBe(1)
     expect(wrapper.find("Connect(ObjectItem)").prop("name")).toBe("test1.jpg")
   })
+
+  it("should pass actions to ObjectItem", () => {
+    const wrapper = shallow(
+      <ObjectContainer object={{ name: "test1.jpg" }} checkedObjectsCount={0} />
+    )
+    expect(wrapper.find("Connect(ObjectItem)").prop("actionButtons")).not.toBe(
+      undefined
+    )
+  })
+
+  it("should pass empty actions to ObjectItem when checkedObjectCount is more than 0", () => {
+    const wrapper = shallow(
+      <ObjectContainer object={{ name: "test1.jpg" }} checkedObjectsCount={1} />
+    )
+    expect(wrapper.find("Connect(ObjectItem)").prop("actionButtons")).toBe(
+      undefined
+    )
+  })
 })

browser/app/js/objects/__tests__/ObjectItem.test.js

@@ -25,17 +25,13 @@ describe("ObjectItem", () => {
 
   it("should render with content type", () => {
     const wrapper = shallow(<ObjectItem name={"test.jpg"} contentType={""} />)
-    expect(
-      wrapper.find(".objects__column--select").prop("data-object-type")
-    ).toBe("image")
+    expect(wrapper.prop("data-type")).toBe("image")
   })
 
   it("should call onClick when the object isclicked", () => {
     const onClick = jest.fn()
     const wrapper = shallow(<ObjectItem name={"test"} onClick={onClick} />)
-    wrapper.find("a").simulate("click", {
-      preventDefault: jest.fn()
-    })
+    wrapper.find("a").simulate("click", { preventDefault: jest.fn() })
     expect(onClick).toHaveBeenCalled()
   })
 

browser/app/js/objects/__tests__/ObjectsBulkActions.test.js

@@ -16,38 +16,42 @@
 
 import React from "react"
 import { shallow } from "enzyme"
-import { Toolbar } from "../Toolbar"
+import { ObjectsBulkActions } from "../ObjectsBulkActions"
 
-jest.mock("../../web", () => ({
-  LoggedIn: jest
-    .fn(() => true)
-    .mockReturnValueOnce(true)
-    .mockReturnValueOnce(false)
-}))
-
-describe("Toolbar", () => {
+describe("ObjectsBulkActions", () => {
   it("should render without crashing", () => {
-    shallow(<Toolbar checkedObjectsCount={0} />)
+    shallow(<ObjectsBulkActions checkedObjectsCount={0} />)
   })
 
-  it("should render Login button when the user has not LoggedIn", () => {
-    const wrapper = shallow(<Toolbar checkedObjectsCount={0} />)
-    expect(wrapper.find("a").text()).toBe("Login")
+  it("should show actions when checkObjectsCount is more than 0", () => {
+    const wrapper = shallow(<ObjectsBulkActions checkedObjectsCount={1} />)
+    expect(wrapper.hasClass("list-actions-toggled")).toBeTruthy()
   })
 
-  it("should render StorageInfo and BrowserDropdown when the user has LoggedIn", () => {
-    const wrapper = shallow(<Toolbar checkedObjectsCount={0} />)
-    expect(wrapper.find("Connect(BrowserDropdown)").length).toBe(1)
+  it("should call downloadChecked when download button is clicked", () => {
+    const downloadChecked = jest.fn()
+    const wrapper = shallow(
+      <ObjectsBulkActions
+        checkedObjectsCount={1}
+        downloadChecked={downloadChecked}
+      />
+    )
+    wrapper.find("#download-checked").simulate("click")
+    expect(downloadChecked).toHaveBeenCalled()
   })
 
-  it("should enable delete action when checkObjectsCount is more than 0", () => {
-    const wrapper = shallow(<Toolbar checkedObjectsCount={1} />)
-    expect(wrapper.find(".zmdi-delete").prop("disabled")).toBeFalsy()
+  it("should call clearChecked when close button is clicked", () => {
+    const clearChecked = jest.fn()
+    const wrapper = shallow(
+      <ObjectsBulkActions checkedObjectsCount={1} clearChecked={clearChecked} />
+    )
+    wrapper.find("#close-bulk-actions").simulate("click")
+    expect(clearChecked).toHaveBeenCalled()
   })
 
-  it("shoud show DeleteObjectConfirmModal when delete button is clicked", () => {
-    const wrapper = shallow(<Toolbar checkedObjectsCount={1} />)
-    wrapper.find("button.zmdi-delete").simulate("click")
+  it("shoud show DeleteObjectConfirmModal when delete-checked button is clicked", () => {
+    const wrapper = shallow(<ObjectsBulkActions checkedObjectsCount={1} />)
+    wrapper.find("#delete-checked").simulate("click")
     wrapper.update()
     expect(wrapper.find("DeleteObjectConfirmModal").length).toBe(1)
   })
@@ -55,22 +59,16 @@ describe("Toolbar", () => {
   it("shoud call deleteChecked when Delete is clicked on confirmation modal", () => {
     const deleteChecked = jest.fn()
     const wrapper = shallow(
-      <Toolbar checkedObjectsCount={1} deleteChecked={deleteChecked} />
+      <ObjectsBulkActions
+        checkedObjectsCount={1}
+        deleteChecked={deleteChecked}
+      />
     )
-    wrapper.find("button.zmdi-delete").simulate("click")
+    wrapper.find("#delete-checked").simulate("click")
     wrapper.update()
     wrapper.find("DeleteObjectConfirmModal").prop("deleteObject")()
     expect(deleteChecked).toHaveBeenCalled()
     wrapper.update()
     expect(wrapper.find("DeleteObjectConfirmModal").length).toBe(0)
   })
-
-  it("should call downloadChecked when download button is clicked", () => {
-    const downloadChecked = jest.fn()
-    const wrapper = shallow(
-      <Toolbar checkedObjectsCount={1} downloadChecked={downloadChecked} />
-    )
-    wrapper.find("button.zmdi-download").simulate("click")
-    expect(downloadChecked).toHaveBeenCalled()
-  })
 })

browser/app/js/objects/__tests__/ObjectsHeader.test.js

@@ -28,13 +28,13 @@ describe("ObjectsHeader", () => {
     const sortObjects = jest.fn()
     const wrapper = shallow(<ObjectsHeader sortObjects={sortObjects} />)
     expect(
-      wrapper.find("#sort-by-name i").hasClass("zmdi-sort-asc")
+      wrapper.find("#sort-by-name i").hasClass("fa-sort-alpha-asc")
     ).toBeTruthy()
     expect(
-      wrapper.find("#sort-by-size i").hasClass("zmdi-sort-amount-asc")
+      wrapper.find("#sort-by-size i").hasClass("fa-sort-amount-asc")
     ).toBeTruthy()
     expect(
-      wrapper.find("#sort-by-last-modified i").hasClass("zmdi-sort-amount-asc")
+      wrapper.find("#sort-by-last-modified i").hasClass("fa-sort-numeric-asc")
     ).toBeTruthy()
   })
 
@@ -44,7 +44,7 @@ describe("ObjectsHeader", () => {
       <ObjectsHeader sortObjects={sortObjects} sortNameOrder={true} />
     )
     expect(
-      wrapper.find("#sort-by-name i").hasClass("zmdi-sort-desc")
+      wrapper.find("#sort-by-name i").hasClass("fa-sort-alpha-desc")
     ).toBeTruthy()
   })
 
@@ -54,7 +54,7 @@ describe("ObjectsHeader", () => {
       <ObjectsHeader sortObjects={sortObjects} sortSizeOrder={true} />
     )
     expect(
-      wrapper.find("#sort-by-size i").hasClass("zmdi-sort-amount-desc")
+      wrapper.find("#sort-by-size i").hasClass("fa-sort-amount-desc")
     ).toBeTruthy()
   })
 
@@ -64,7 +64,7 @@ describe("ObjectsHeader", () => {
       <ObjectsHeader sortObjects={sortObjects} sortLastModifiedOrder={true} />
     )
     expect(
-      wrapper.find("#sort-by-last-modified i").hasClass("zmdi-sort-amount-desc")
+      wrapper.find("#sort-by-last-modified i").hasClass("fa-sort-numeric-desc")
     ).toBeTruthy()
   })
 

browser/app/js/objects/__tests__/ObjectsListContainer.test.js

@@ -32,12 +32,8 @@ describe("ObjectsList", () => {
     )
     expect(wrapper.find("ObjectsList").length).toBe(1)
     expect(wrapper.find("ObjectsList").prop("objects")).toEqual([
-      {
-        name: "test1.jpg"
-      },
-      {
-        name: "test2.jpg"
-      }
+      { name: "test1.jpg" },
+      { name: "test2.jpg" }
     ])
   })
 
@@ -45,9 +41,6 @@ describe("ObjectsList", () => {
     const wrapper = shallow(
       <ObjectsListContainer currentBucket="test1" isTruncated={true} />
     )
-    expect(wrapper.find(".text-center").prop("style")).toHaveProperty(
-      "display",
-      "block"
-    )
+    expect(wrapper.find(".text-center").prop("style")).toHaveProperty("display", "block")
   })
 })

browser/app/js/objects/__tests__/Path.test.js

@@ -25,7 +25,7 @@ describe("Path", () => {
 
   it("should render only bucket if there is no prefix", () => {
     const wrapper = shallow(<Path currentBucket={"test1"} currentPrefix={""} />)
-    expect(wrapper.find("a").length).toBe(1)
+    expect(wrapper.find("span").length).toBe(1)
     expect(wrapper.text()).toBe("test1")
   })
 
@@ -33,22 +33,22 @@ describe("Path", () => {
     const wrapper = shallow(
       <Path currentBucket={"test1"} currentPrefix={"a/b/"} />
     )
-    expect(wrapper.find("a").length).toBe(3)
+    expect(wrapper.find("span").length).toBe(3)
     expect(
       wrapper
-        .find("a")
+        .find("span")
         .at(0)
         .text()
     ).toBe("test1")
     expect(
       wrapper
-        .find("a")
+        .find("span")
         .at(1)
         .text()
     ).toBe("a")
     expect(
       wrapper
-        .find("a")
+        .find("span")
         .at(2)
         .text()
     ).toBe("b")
@@ -66,9 +66,7 @@ describe("Path", () => {
     wrapper
       .find("a")
       .at(2)
-      .simulate("click", {
-        preventDefault: jest.fn()
-      })
+      .simulate("click", { preventDefault: jest.fn() })
     expect(selectPrefix).toHaveBeenCalledWith("a/b/")
   })
 })

browser/app/js/objects/__tests__/ShareObjectModal.test.js

@@ -88,14 +88,8 @@ describe("ShareObjectModal", () => {
 
   describe("Update expiry values", () => {
     const props = {
-      object: {
-        name: "obj1"
-      },
-      shareObjectDetails: {
-        show: true,
-        object: "obj1",
-        url: "test"
-      }
+      object: { name: "obj1" },
+      shareObjectDetails: { show: true, object: "obj1", url: "test" }
     }
     it("should have default expiry values", () => {
       const wrapper = shallow(<ShareObjectModal {...props} />)

browser/app/js/objects/__tests__/actions.test.js

@@ -24,14 +24,7 @@ jest.mock("../../web", () => ({
   LoggedIn: jest.fn(() => true).mockReturnValueOnce(false),
   ListObjects: jest.fn(() => {
     return Promise.resolve({
-      objects: [
-        {
-          name: "test1"
-        },
-        {
-          name: "test2"
-        }
-      ],
+      objects: [{ name: "test1" }, { name: "test2" }],
       istruncated: false,
       nextmarker: "test2",
       writable: false
@@ -39,38 +32,26 @@ jest.mock("../../web", () => ({
   }),
   RemoveObject: jest.fn(({ bucketName, objects }) => {
     if (!bucketName) {
-      return Promise.reject({
-        message: "Invalid bucket"
-      })
+      return Promise.reject({ message: "Invalid bucket" })
     }
     return Promise.resolve({})
   }),
   PresignedGet: jest.fn(({ bucket, object }) => {
     if (!bucket) {
-      return Promise.reject({
-        message: "Invalid bucket"
-      })
+      return Promise.reject({ message: "Invalid bucket" })
     }
-    return Promise.resolve({
-      url: "https://test.com/bk1/pre1/b.txt"
-    })
+    return Promise.resolve({ url: "https://test.com/bk1/pre1/b.txt" })
   }),
   CreateURLToken: jest
     .fn()
     .mockImplementationOnce(() => {
-      return Promise.resolve({
-        token: "test"
-      })
+      return Promise.resolve({ token: "test" })
     })
     .mockImplementationOnce(() => {
-      return Promise.reject({
-        message: "Error in creating token"
-      })
+      return Promise.reject({ message: "Error in creating token" })
     })
     .mockImplementationOnce(() => {
-      return Promise.resolve({
-        token: "test"
-      })
+      return Promise.resolve({ token: "test" })
     })
 }))
 
@@ -83,28 +64,14 @@ describe("Objects actions", () => {
     const expectedActions = [
       {
         type: "objects/SET_LIST",
-        objects: [
-          {
-            name: "test1"
-          },
-          {
-            name: "test2"
-          }
-        ],
+        objects: [{ name: "test1" }, { name: "test2" }],
         isTruncated: false,
         marker: "test2"
       }
     ]
     store.dispatch(
       actionsObjects.setList(
-        [
-          {
-            name: "test1"
-          },
-          {
-            name: "test2"
-          }
-        ],
+        [{ name: "test1" }, { name: "test2" }],
         "test2",
         false
       )
@@ -141,24 +108,13 @@ describe("Objects actions", () => {
 
   it("creates objects/SET_LIST after fetching the objects", () => {
     const store = mockStore({
-      buckets: {
-        currentBucket: "bk1"
-      },
-      objects: {
-        currentPrefix: ""
-      }
+      buckets: { currentBucket: "bk1" },
+      objects: { currentPrefix: "" }
     })
     const expectedActions = [
       {
         type: "objects/SET_LIST",
-        objects: [
-          {
-            name: "test1"
-          },
-          {
-            name: "test2"
-          }
-        ],
+        objects: [{ name: "test1" }, { name: "test2" }],
         marker: "test2",
         isTruncated: false
       },
@@ -183,24 +139,13 @@ describe("Objects actions", () => {
 
   it("creates objects/APPEND_LIST after fetching more objects", () => {
     const store = mockStore({
-      buckets: {
-        currentBucket: "bk1"
-      },
-      objects: {
-        currentPrefix: ""
-      }
+      buckets: { currentBucket: "bk1" },
+      objects: { currentPrefix: "" }
     })
     const expectedActions = [
       {
         type: "objects/APPEND_LIST",
-        objects: [
-          {
-            name: "test1"
-          },
-          {
-            name: "test2"
-          }
-        ],
+        objects: [{ name: "test1" }, { name: "test2" }],
         marker: "test2",
         isTruncated: false
       },
@@ -248,21 +193,12 @@ describe("Objects actions", () => {
 
   it("should update browser url and creates objects/SET_CURRENT_PREFIX and objects/CHECKED_LIST_RESET actions when selectPrefix is called", () => {
     const store = mockStore({
-      buckets: {
-        currentBucket: "test"
-      },
-      objects: {
-        currentPrefix: ""
-      }
+      buckets: { currentBucket: "test" },
+      objects: { currentPrefix: "" }
     })
     const expectedActions = [
-      {
-        type: "objects/SET_CURRENT_PREFIX",
-        prefix: "abc/"
-      },
-      {
-        type: "objects/CHECKED_LIST_RESET"
-      }
+      { type: "objects/SET_CURRENT_PREFIX", prefix: "abc/" },
+      { type: "objects/CHECKED_LIST_RESET" }
     ]
     store.dispatch(actionsObjects.selectPrefix("abc/"))
     const actions = store.getActions()
@@ -273,10 +209,7 @@ describe("Objects actions", () => {
   it("create objects/SET_PREFIX_WRITABLE action", () => {
     const store = mockStore()
     const expectedActions = [
-      {
-        type: "objects/SET_PREFIX_WRITABLE",
-        prefixWritable: true
-      }
+      { type: "objects/SET_PREFIX_WRITABLE", prefixWritable: true }
     ]
     store.dispatch(actionsObjects.setPrefixWritable(true))
     const actions = store.getActions()
@@ -285,12 +218,7 @@ describe("Objects actions", () => {
 
   it("creates objects/REMOVE action", () => {
     const store = mockStore()
-    const expectedActions = [
-      {
-        type: "objects/REMOVE",
-        object: "obj1"
-      }
-    ]
+    const expectedActions = [{ type: "objects/REMOVE", object: "obj1" }]
     store.dispatch(actionsObjects.removeObject("obj1"))
     const actions = store.getActions()
     expect(actions).toEqual(expectedActions)
@@ -298,19 +226,10 @@ describe("Objects actions", () => {
 
   it("creates objects/REMOVE action when object is deleted", () => {
     const store = mockStore({
-      buckets: {
-        currentBucket: "test"
-      },
-      objects: {
-        currentPrefix: "pre1/"
-      }
+      buckets: { currentBucket: "test" },
+      objects: { currentPrefix: "pre1/" }
     })
-    const expectedActions = [
-      {
-        type: "objects/REMOVE",
-        object: "obj1"
-      }
-    ]
+    const expectedActions = [{ type: "objects/REMOVE", object: "obj1" }]
     store.dispatch(actionsObjects.deleteObject("obj1")).then(() => {
       const actions = store.getActions()
       expect(actions).toEqual(expectedActions)
@@ -319,21 +238,13 @@ describe("Objects actions", () => {
 
   it("creates alert/SET action when invalid bucket is provided", () => {
     const store = mockStore({
-      buckets: {
-        currentBucket: ""
-      },
-      objects: {
-        currentPrefix: "pre1/"
-      }
+      buckets: { currentBucket: "" },
+      objects: { currentPrefix: "pre1/" }
     })
     const expectedActions = [
       {
         type: "alert/SET",
-        alert: {
-          type: "danger",
-          message: "Invalid bucket",
-          id: 0
-        }
+        alert: { type: "danger", message: "Invalid bucket", id: 0 }
       }
     ]
     return store.dispatch(actionsObjects.deleteObject("obj1")).then(() => {
@@ -374,12 +285,8 @@ describe("Objects actions", () => {
 
   it("creates objects/SET_SHARE_OBJECT when object is shared", () => {
     const store = mockStore({
-      buckets: {
-        currentBucket: "bk1"
-      },
-      objects: {
-        currentPrefix: "pre1/"
-      }
+      buckets: { currentBucket: "bk1" },
+      objects: { currentPrefix: "pre1/" }
     })
     const expectedActions = [
       {
@@ -407,12 +314,8 @@ describe("Objects actions", () => {
 
   it("creates alert/SET when shareObject is failed", () => {
     const store = mockStore({
-      buckets: {
-        currentBucket: ""
-      },
-      objects: {
-        currentPrefix: "pre1/"
-      }
+      buckets: { currentBucket: "" },
+      objects: { currentPrefix: "pre1/" }
     })
     const expectedActions = [
       {
@@ -446,12 +349,8 @@ describe("Objects actions", () => {
         }
       })
       const store = mockStore({
-        buckets: {
-          currentBucket: "bk1"
-        },
-        objects: {
-          currentPrefix: "pre1/"
-        }
+        buckets: { currentBucket: "bk1" },
+        objects: { currentPrefix: "pre1/" }
       })
       store.dispatch(actionsObjects.downloadObject("obj1"))
       const url = `${
@@ -473,12 +372,8 @@ describe("Objects actions", () => {
         }
       })
       const store = mockStore({
-        buckets: {
-          currentBucket: "bk1"
-        },
-        objects: {
-          currentPrefix: "pre1/"
-        }
+        buckets: { currentBucket: "bk1" },
+        objects: { currentPrefix: "pre1/" }
       })
       return store.dispatch(actionsObjects.downloadObject("obj1")).then(() => {
         const url = `${
@@ -492,12 +387,8 @@ describe("Objects actions", () => {
 
     it("create alert/SET action when CreateUrlToken fails", () => {
       const store = mockStore({
-        buckets: {
-          currentBucket: "bk1"
-        },
-        objects: {
-          currentPrefix: "pre1/"
-        }
+        buckets: { currentBucket: "bk1" },
+        objects: { currentPrefix: "pre1/" }
       })
       const expectedActions = [
         {
@@ -564,13 +455,8 @@ describe("Objects actions", () => {
     window.XMLHttpRequest = jest.fn().mockImplementation(xhrMockClass)
 
     const store = mockStore({
-      buckets: {
-        currentBucket: "bk1"
-      },
-      objects: {
-        currentPrefix: "pre1/",
-        checkedList: ["obj1"]
-      }
+      buckets: { currentBucket: "bk1" },
+      objects: { currentPrefix: "pre1/", checkedList: ["obj1"] }
     })
     return store.dispatch(actionsObjects.downloadCheckedObjects()).then(() => {
       const requestUrl = `${

browser/app/js/objects/__tests__/reducer.test.js

@@ -40,25 +40,11 @@ describe("objects reducer", () => {
   it("should handle SET_LIST", () => {
     const newState = reducer(undefined, {
       type: actions.SET_LIST,
-      objects: [
-        {
-          name: "obj1"
-        },
-        {
-          name: "obj2"
-        }
-      ],
+      objects: [{ name: "obj1" }, { name: "obj2" }],
       marker: "obj2",
       isTruncated: false
     })
-    expect(newState.list).toEqual([
-      {
-        name: "obj1"
-      },
-      {
-        name: "obj2"
-      }
-    ])
+    expect(newState.list).toEqual([{ name: "obj1" }, { name: "obj2" }])
     expect(newState.marker).toBe("obj2")
     expect(newState.isTruncated).toBeFalsy()
   })
@@ -66,44 +52,22 @@ describe("objects reducer", () => {
   it("should handle APPEND_LIST", () => {
     const newState = reducer(
       {
-        list: [
-          {
-            name: "obj1"
-          },
-          {
-            name: "obj2"
-          }
-        ],
+        list: [{ name: "obj1" }, { name: "obj2" }],
         marker: "obj2",
         isTruncated: true
       },
       {
         type: actions.APPEND_LIST,
-        objects: [
-          {
-            name: "obj3"
-          },
-          {
-            name: "obj4"
-          }
-        ],
+        objects: [{ name: "obj3" }, { name: "obj4" }],
         marker: "obj4",
         isTruncated: false
       }
     )
     expect(newState.list).toEqual([
-      {
-        name: "obj1"
-      },
-      {
-        name: "obj2"
-      },
-      {
-        name: "obj3"
-      },
-      {
-        name: "obj4"
-      }
+      { name: "obj1" },
+      { name: "obj2" },
+      { name: "obj3" },
+      { name: "obj4" }
     ])
     expect(newState.marker).toBe("obj4")
     expect(newState.isTruncated).toBeFalsy()
@@ -111,53 +75,24 @@ describe("objects reducer", () => {
 
   it("should handle REMOVE", () => {
     const newState = reducer(
-      {
-        list: [
-          {
-            name: "obj1"
-          },
-          {
-            name: "obj2"
-          }
-        ]
-      },
+      { list: [{ name: "obj1" }, { name: "obj2" }] },
       {
         type: actions.REMOVE,
         object: "obj1"
       }
     )
-    expect(newState.list).toEqual([
-      {
-        name: "obj2"
-      }
-    ])
+    expect(newState.list).toEqual([{ name: "obj2" }])
   })
 
   it("should handle REMOVE with non-existent object", () => {
     const newState = reducer(
-      {
-        list: [
-          {
-            name: "obj1"
-          },
-          {
-            name: "obj2"
-          }
-        ]
-      },
+      { list: [{ name: "obj1" }, { name: "obj2" }] },
       {
         type: actions.REMOVE,
         object: "obj3"
       }
     )
-    expect(newState.list).toEqual([
-      {
-        name: "obj1"
-      },
-      {
-        name: "obj2"
-      }
-    ])
+    expect(newState.list).toEqual([{ name: "obj1" }, { name: "obj2" }])
   })
 
   it("should handle SET_SORT_BY", () => {
@@ -178,11 +113,7 @@ describe("objects reducer", () => {
 
   it("should handle SET_CURRENT_PREFIX", () => {
     const newState = reducer(
-      {
-        currentPrefix: "test1/",
-        marker: "abc",
-        isTruncated: true
-      },
+      { currentPrefix: "test1/", marker: "abc", isTruncated: true },
       {
         type: actions.SET_CURRENT_PREFIX,
         prefix: "test2/"
@@ -225,9 +156,7 @@ describe("objects reducer", () => {
 
   it("should handle SELECTED_LIST_REMOVE", () => {
     const newState = reducer(
-      {
-        checkedList: ["obj1", "obj2"]
-      },
+      { checkedList: ["obj1", "obj2"] },
       {
         type: actions.CHECKED_LIST_REMOVE,
         object: "obj1"
@@ -238,9 +167,7 @@ describe("objects reducer", () => {
 
   it("should handle CHECKED_LIST_RESET", () => {
     const newState = reducer(
-      {
-        checkedList: ["obj1", "obj2"]
-      },
+      { checkedList: ["obj1", "obj2"] },
       {
         type: actions.CHECKED_LIST_RESET
       }