Merge pull request #1 from rutvora/test

Add tests for expiration in years and no expiry
SharzyL · Aug 20, 2024 · e8972ba · e8972ba
2 parents b652ba4 + 2bb3618
commit e8972ba
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/frontend/index.client.js b/frontend/index.client.js
@@ -83,7 +83,7 @@ window.addEventListener('DOMContentLoaded', () => {
     const pasteNotEmpty = inputType === 'edit'
       ? pasteEditArea.prop('value').length > 0
       : file !== null
-    expirationValid = EXPIRE_REGEX.test(expiration)  // TODO: verify it
+    let expirationValid = EXPIRE_REGEX.test(expiration)  // TODO: verify it
     if (!expiration) {
       expirationValid = true
     }

diff --git a/frontend/index.html b/frontend/index.html
@@ -43,7 +43,7 @@ <h2>Settings</h2>
         <div id='paste-expiration-panel' class='paste-setting-subitem-panel'>
             <input list='expiration-choices' type='text' min='60' step='1' name='paste-expiration'
                    id='paste-expiration-input' placeholder='Expiration (secs)' value='7d'>
-            <label class='small-label' for='paste-expiration-input'>Delete your paste after a period of time (leave blank for no expiry). <br>Units: s (seconds), m (minutes), h (hours), d (days), M (months), Y (years) <br> Max 68 years</label>
+            <label class='small-label' for='paste-expiration-input'>Delete your paste after a period of time (leave blank for no expiry). <br>Units: s (seconds), m (minutes), h (hours), d (days), M (months), Y (years)</label>
         </div>
         <div id='paste-passwd-panel' class='paste-setting-subitem-panel'>
             <input type='text' spellcheck='false' name='paste-expiration' id='paste-passwd-input' placeholder='Password'>

diff --git a/test/basic.spec.js b/test/basic.spec.js
@@ -128,7 +128,9 @@ test("expire", async () => {
   await testExpireParse("100h", 360000)
   await testExpireParse("1d", 86400)
   await testExpireParse("1M", 2592000)
+  await testExpireParse("1Y", 31536000)
   await testExpireParse("100  m", 6000)
+  await testExpireParse("", null)
 
   const testFailParse = async (expire) => {
     const uploadResponse = await workerFetch(new Request(BASE_URL, {