From c6d2ed58d657be2c3949c75fe1ec2569d18fd043 Mon Sep 17 00:00:00 2001
From: Joost De Cock <joost@decock.org>
Date: Thu, 19 Mar 2020 10:44:29 +0100
Subject: [PATCH] chore: Updated changelog and tests tweaks

---
 config/changelog.yaml      | 15 +++++--
 tests/patterns/config.js   |  2 +
 tests/patterns/drafting.js | 18 +++++----
 tests/patterns/sampling.js | 80 ++++++++++++++++++++------------------
 4 files changed, 66 insertions(+), 49 deletions(-)

diff --git a/config/changelog.yaml b/config/changelog.yaml
index 2a06b564188..a6f50002e11 100644
--- a/config/changelog.yaml
+++ b/config/changelog.yaml
@@ -1,15 +1,22 @@
 Unreleased:
   date:
   Added:
-  Changed:
+  Changes:
+  Deprecated:
+  Fixed:
+  Removed:
+  Security:
+
+2.4.5:
+  date: 2020-03-19
+  Changes:
+    fu:
+      - Improved shape based on community feedback
     utils:
       - neckstimate() now returns values rounded to nearest mm
-  Deprecated:
   Fixed:
     wahid:
       - Check whether frontScyeDart option is zero prior to implementing it
-  Removed:
-  Security:
 
 2.4.4:
   date: 2020-03-15
diff --git a/tests/patterns/config.js b/tests/patterns/config.js
index 6ddf4d02ccb..82e5ce0ae24 100644
--- a/tests/patterns/config.js
+++ b/tests/patterns/config.js
@@ -180,9 +180,11 @@ const testPatternConfig = (design, pattern, expect, models, patterns) => {
     }
     else if (type === 'number') {
       // Static number
+      return true
     }
     else if (type === 'string') {
       // Static string
+      return true
     }
   }
 }
diff --git a/tests/patterns/drafting.js b/tests/patterns/drafting.js
index 4e332f745b9..087572bc600 100644
--- a/tests/patterns/drafting.js
+++ b/tests/patterns/drafting.js
@@ -33,14 +33,16 @@ const testPatternDrafting = (design, Pattern, expect, models, patterns) => {
   /*
    * Draft pattern for different models
    */
-  it('Draft for different models:' , () => true)
+  if (['rendertest', 'tutorial', 'examples'].indexOf(design) === -1) {
+    it('Draft for different models:' , () => true)
 
-  for (let size in ourModels) {
-    it(`  - Drafting for ${size} (${breasts ? 'with':'no'} breasts)`, () => {
-      expect(doesItDraft(new Pattern({
-        measurements: ourModels[size],
-      }))).to.equal(true)
-    })
+    for (let size in ourModels) {
+      it(`  - Drafting for ${size} (${breasts ? 'with':'no'} breasts)`, () => {
+        expect(doesItDraft(new Pattern({
+          measurements: ourModels[size],
+        }))).to.equal(true)
+      })
+    }
   }
 
   /*
@@ -48,7 +50,7 @@ const testPatternDrafting = (design, Pattern, expect, models, patterns) => {
    */
   it('Draft parts individually:' , () => true)
   let parts
-  if (['rendertest', 'tutorial'].indexOf(design) === -1) parts = patterns.parts[design]
+  if (['rendertest', 'tutorial', 'examples'].indexOf(design) === -1) parts = patterns.parts[design]
   else parts = Pattern.config.parts
   for (let name of parts) {
     it(`  - ${name} should draft on its own`, () => {
diff --git a/tests/patterns/sampling.js b/tests/patterns/sampling.js
index de96835603e..2b64034ca76 100644
--- a/tests/patterns/sampling.js
+++ b/tests/patterns/sampling.js
@@ -31,51 +31,57 @@ const testPatternSampling = (design, Pattern, expect, models, patterns) => {
   const measurements = ourModels
     [breasts ? 'size34' : 'size42']
 
-  /*
-   * Sample different measurements
-   */
-  it('Sample different measurements:' , () => true)
-  for (let measurement of Pattern.config.measurements) {
-    it(`  Sample ${measurement}:` , () => {
+  if (['rendertest', 'tutorial', 'examples'].indexOf(design) === -1) {
+    /*
+     * Sample different measurements
+     */
+    it('Sample different measurements:' , () => true)
+    for (let measurement of Pattern.config.measurements) {
+      it(`  Sample ${measurement}:` , () => {
+        expect(doesItSample(new Pattern({
+          sample: {
+            type: 'measurement',
+            measurement
+          },
+          measurements
+        }))).to.equal(true)
+      })
+    }
+  }
+
+  if (['rendertest', 'tutorial', 'examples'].indexOf(design) === -1) {
+    /*
+     * Sample different options
+     */
+    it('Sample different options:' , () => true)
+    for (let option in Pattern.config.options) {
+      it(`  Sample ${option}:` , () => {
+        expect(doesItSample(new Pattern({
+          sample: {
+            type: 'option',
+            option
+          },
+          measurements
+        }))).to.equal(true)
+      })
+    }
+  }
+
+  if (['rendertest', 'tutorial', 'examples'].indexOf(design) === -1) {
+    /*
+     * Sample pattern for different models
+     */
+    it('Sample pattern for different models:' , () => {
       expect(doesItSample(new Pattern({
         sample: {
-          type: 'measurement',
-          measurement
+          type: 'models',
+          models: ourModels,
         },
         measurements
       }))).to.equal(true)
     })
   }
 
-  /*
-   * Sample different options
-   */
-  it('Sample different options:' , () => true)
-  for (let option in Pattern.config.options) {
-    it(`  Sample ${option}:` , () => {
-      expect(doesItSample(new Pattern({
-        sample: {
-          type: 'option',
-          option
-        },
-        measurements
-      }))).to.equal(true)
-    })
-  }
-
-  /*
-   * Sample pattern for different models
-   */
-  it('Sample pattern for different models:' , () => {
-    expect(doesItSample(new Pattern({
-      sample: {
-        type: 'models',
-        models: ourModels,
-      },
-      measurements
-    }))).to.equal(true)
-  })
-
 }
 
 module.exports = testPatternSampling