Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(isBefore): allow usage of options object #2088

Open
wants to merge 35 commits into
base: master
Choose a base branch
from

Conversation

pixelbucket-dev
Copy link
Contributor

@pixelbucket-dev pixelbucket-dev commented Oct 25, 2022

This PR implements steps 1 and 2 of #1874 for isBefore and builds upon #2075.

This PR extracts tests for isBefore into a separate test file ⇾ test/validators/isBefore.test.js (inspired by #1793).

This PR also renames the proposed date option to comparisonDate, because it is more explicit. If verified, it should be implemented in #2075 as well.

Checklist

  • PR contains only changes related; no stray files, etc.
  • README updated (where applicable)
  • Tests written (where applicable)

@pixelbucket-dev pixelbucket-dev marked this pull request as ready for review October 25, 2022 14:08
@codecov
Copy link

codecov bot commented Oct 25, 2022

Codecov Report

Base: 100.00% // Head: 100.00% // No change to project coverage 👍

Coverage data is based on head (18d652b) compared to base (54d330c).
Patch coverage: 100.00% of modified lines in pull request are covered.

❗ Current head 18d652b differs from pull request most recent head 57d8945. Consider uploading reports for the commit 57d8945 to get more accurate results

Additional details and impacted files
@@            Coverage Diff            @@
##            master     #2088   +/-   ##
=========================================
  Coverage   100.00%   100.00%           
=========================================
  Files          105       105           
  Lines         2324      2323    -1     
  Branches       586       586           
=========================================
- Hits          2324      2323    -1     
Impacted Files Coverage Δ
src/lib/isAfter.js 100.00% <100.00%> (ø)
src/lib/isBefore.js 100.00% <100.00%> (ø)

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

Copy link
Member

@WikiRik WikiRik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Few remarks, thanks for working on this!

test/validators/isBefore.test.js Outdated Show resolved Hide resolved
src/lib/isBefore.js Outdated Show resolved Hide resolved
src/lib/toDate.js Outdated Show resolved Hide resolved
src/lib/isBefore.js Outdated Show resolved Hide resolved
Copy link
Member

@WikiRik WikiRik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Few final comments so that this is consistent with my changes to isAfter and the project in general, but apart from these we should be good I think

src/lib/isBefore.js Show resolved Hide resolved
src/lib/isBefore.js Outdated Show resolved Hide resolved
src/lib/isBefore.js Show resolved Hide resolved
src/lib/isBefore.js Outdated Show resolved Hide resolved
@pixelbucket-dev pixelbucket-dev force-pushed the isBefore-options-refactor branch from b4167b7 to e907cde Compare January 3, 2023 20:25
@rubiin rubiin requested a review from WikiRik January 23, 2023 07:10
@WikiRik WikiRik added the 🧹 needs-update For PRs that need to be updated before landing label Jan 30, 2023
@pixelbucket-dev
Copy link
Contributor Author

I think this should be good to go :).

Copy link
Member

@WikiRik WikiRik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Few remarks to be more in line with how isAfter was done, but those should be my last

Comment on lines 4 to 6
// accessing 'arguments' for backwards compatibility: isBefore(str [, comparisonDate])
// eslint-disable-next-line prefer-rest-params
const comparisonDate = (typeof options === 'object' ? options.comparisonDate : arguments[1]) || Date().toString();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// accessing 'arguments' for backwards compatibility: isBefore(str [, comparisonDate])
// eslint-disable-next-line prefer-rest-params
const comparisonDate = (typeof options === 'object' ? options.comparisonDate : arguments[1]) || Date().toString();
// For backwards compatibility:
// isBefore(str [, date]), i.e. `options` could be used as argument for the legacy `date`
const comparisonDate = options?.comparisonDate || options || Date().toString();

Would this work as well? Copied from isAfter

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nope, that would be a bug :(.

If comparisonDate is undefined, the ternary operator will therefore evaluate to options, which would be { comparisonDate: undefined }. The latter will break when using inside toDate, because it is not a string.

Well spotted anyway. This way I realised that I wanted to add tests to cover this scenario.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's the case in isAfter as well right? So we can fix it for both validators in this PR I think

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that would be the case. I will add a fix.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've fixed isAfter and added tests. FYI, the last test would fail with the old way in isAfter.

src/lib/isBefore.js Outdated Show resolved Hide resolved
src/lib/isBefore.js Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
import test from '../testFunctions';

describe('isBefore', () => {
it('should validate dates against an end date', () => {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't do it for isAfter but maybe we can split this up in two it blocks? One without arguments (or at least that don't use the old nor new syntax like []) and one with arguments. This way it's easier to see what the changes are of the two syntaxes and therefore the scenarios that we need to replicate
Just a new idea, so I'm open for feedback and other ideas

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I am not sure what you mean. Could you give an example with the new syntax?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The new syntax is using the comparisonDate in the object.

So we would have;

describe('isBefore'
   it('should validate dates against the current date'
     test({
       validator: 'isBefore',
       valid: ,
       invalid:
     })
     test({
       validator: 'isBefore',
       args: [],
       valid: ,
       invalid:
      })
   it('should validate dates against an end date'
     test({
       validator: 'isBefore',
       args: [{ comparisonDate: ],
       valid: ,
       invalid:
      })
   describe('(legacy syntax)'
     it('should validate dates against an end date'
       test({
         validator: 'isBefore',
         args: ['08/04/2011'],
         valid: ,
         invalid:
        })

Is that clear?

Copy link
Contributor Author

@pixelbucket-dev pixelbucket-dev Feb 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've just pushed a proposed refactor to the tests. Let me know what you think :). Here you can also see how important it is to write test cases for all possible scenarios and permutations, ideally upfront, before implementation. That would have made it easier to refactor the implementation to the new syntax. The existing tests probably still lack possible values or permutations. We should probably also test against other nullish values. E.g. should we guard against null? Because the code will break if options === null.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🧹 needs-update For PRs that need to be updated before landing
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants