Fix/add unit tests

frontend/src/metabase/meta/Parameter.js

@@ -62,11 +62,11 @@ type DeserializeFn = (match: any[], fieldRef: LocalFieldReference | ForeignField
 const timeParameterValueDeserializers: Deserializer[] = [
     {testRegex: /^past([0-9]+)([a-z]+)s(~)?$/, deserialize: (matches, fieldRef) =>
         // $FlowFixMe: not matching TimeIntervalFilter for some reason
-        ["time-interval", fieldRef, -parseInt(matches[0]), matches[1], matches[2] ? { "include-current": true } : {}]
+        ["time-interval", fieldRef, -parseInt(matches[0]), matches[1]].concat(matches[2] ? [{ "include-current": true }] : [])
     },
     {testRegex: /^next([0-9]+)([a-z]+)s(~)?$/, deserialize: (matches, fieldRef) =>
         // $FlowFixMe: not matching TimeIntervalFilter for some reason
-        ["time-interval", fieldRef, parseInt(matches[0]), matches[1], matches[2] ? { "include-current": true } : {}]
+        ["time-interval", fieldRef, parseInt(matches[0]), matches[1]].concat(matches[2] ? [{ "include-current": true }] : [])
     },
     {testRegex: /^this([a-z]+)$/, deserialize: (matches, fieldRef) =>
         ["time-interval", fieldRef, "current", matches[0]]

frontend/test/meta/Parameter.unit.spec.js

@@ -5,9 +5,15 @@ describe("metabase/meta/Parameter", () => {
         it ("should parse past30days", () => {
             expect(dateParameterValueToMBQL("past30days", null)).toEqual(["time-interval", null, -30, "day"])
         })
+        it ("should parse past30days~", () => {
+            expect(dateParameterValueToMBQL("past30days~", null)).toEqual(["time-interval", null, -30, "day", { "include-current": true }])
+        })
         it ("should parse next2years", () => {
             expect(dateParameterValueToMBQL("next2years", null)).toEqual(["time-interval", null, 2, "year"])
         })
+        it ("should parse next2years~", () => {
+            expect(dateParameterValueToMBQL("next2years~", null)).toEqual(["time-interval", null, 2, "year", { "include-current": true }])
+        })
         it ("should parse thisday", () => {
             expect(dateParameterValueToMBQL("thisday", null)).toEqual(["time-interval", null, "current", "day"])
         })

frontend/test/query_builder/components/filters/FilterPopover.unit.spec.js

@@ -48,26 +48,22 @@ describe('FilterPopover', () => {
         })
         describe('including the current period', () => {
             it('should not show a control to the user for the appropriate types of queries', () => {
-                const wrapper = shallow(
+                const wrapper = mount(
                     <FilterPopover
                         query={QUERY}
                         filter={QUERY.filters()[1]}
                     />
                 )
-
-                const toggle = wrapper.find(CheckBox)
-                expect(toggle.length).toBe(0)
+                expect(wrapper.find(CheckBox).length).toBe(0)
             })
             it('should show a control to the user for the appropriate types of queries', () => {
-                const wrapper = shallow(
+                const wrapper = mount(
                     <FilterPopover
                         query={QUERY}
                         filter={QUERY.filters()[0]}
                     />
                 )
-
-                const toggle = wrapper.find(CheckBox)
-                expect(toggle.length).toBe(1)
+                expect(wrapper.find(CheckBox).length).toBe(1)
             })
             it('should let the user toggle', () => {
                 const wrapper = mount(