diff --git a/.github/workflows/tests.carlita.yml b/.github/workflows/tests.carlita.yml index a449f841682..ee24a68330d 100644 --- a/.github/workflows/tests.carlita.yml +++ b/.github/workflows/tests.carlita.yml @@ -23,7 +23,7 @@ jobs: env: CI: true - name: Install peer & test dependencies - run: cd packages/carlita && npm install @freesewing/core @freesewing/plugin-bundle @freesewing/bent @freesewing/carlton @freesewing/plugin-bust @freesewing/plugin-buttons @freesewing/models @freesewing/pattern-info mocha chai + run: cd packages/carlita && npm install @freesewing/core @freesewing/plugin-bundle @freesewing/brian @freesewing/bent @freesewing/carlton @freesewing/plugin-bust @freesewing/plugin-buttons @freesewing/models @freesewing/pattern-info mocha chai env: CI: true - name: Build pattern diff --git a/.github/workflows/tests.carlton.yml b/.github/workflows/tests.carlton.yml index 5307546fdf1..813ab208720 100644 --- a/.github/workflows/tests.carlton.yml +++ b/.github/workflows/tests.carlton.yml @@ -23,7 +23,7 @@ jobs: env: CI: true - name: Install peer & test dependencies - run: cd packages/carlton && npm install @freesewing/core @freesewing/plugin-bundle @freesewing/bent @freesewing/plugin-buttons @freesewing/models @freesewing/pattern-info mocha chai + run: cd packages/carlton && npm install @freesewing/core @freesewing/plugin-bundle @freesewing/brian @freesewing/bent @freesewing/plugin-buttons @freesewing/models @freesewing/pattern-info mocha chai env: CI: true - name: Build pattern diff --git a/.github/workflows/tests.huey.yml b/.github/workflows/tests.huey.yml index 0ce1d33f8bf..8b7c56dbe33 100644 --- a/.github/workflows/tests.huey.yml +++ b/.github/workflows/tests.huey.yml @@ -23,7 +23,7 @@ jobs: env: CI: true - name: Install peer & test dependencies - run: cd packages/huey && npm install @freesewing/core @freesewing/plugin-bundle @freesewing/models @freesewing/pattern-info mocha chai + run: cd packages/huey && npm install @freesewing/core @freesewing/plugin-bundle @freesewing/brian @freesewing/models @freesewing/pattern-info mocha chai env: CI: true - name: Build pattern diff --git a/.github/workflows/tests.jaeger.yml b/.github/workflows/tests.jaeger.yml index e6ed1a455a6..218fce63caa 100644 --- a/.github/workflows/tests.jaeger.yml +++ b/.github/workflows/tests.jaeger.yml @@ -23,7 +23,7 @@ jobs: env: CI: true - name: Install peer & test dependencies - run: cd packages/jaeger && npm install @freesewing/core @freesewing/plugin-bundle @freesewing/bent @freesewing/plugin-buttons @freesewing/models @freesewing/pattern-info mocha chai + run: cd packages/jaeger && npm install @freesewing/core @freesewing/plugin-bundle @freesewing/brian @freesewing/bent @freesewing/plugin-buttons @freesewing/models @freesewing/pattern-info mocha chai env: CI: true - name: Build pattern diff --git a/config/dependencies.yaml b/config/dependencies.yaml index 7ed167c7206..9696fcc311e 100644 --- a/config/dependencies.yaml +++ b/config/dependencies.yaml @@ -53,12 +53,14 @@ bent: "@freesewing/brian": "^{{version}}" carlita: peer: + "@freesewing/brian": "^{{version}}" "@freesewing/bent": "^{{version}}" "@freesewing/carlton": "^{{version}}" "@freesewing/plugin-bust": "^{{version}}" "@freesewing/plugin-buttons": "^{{version}}" carlton: peer: + "@freesewing/brian": "^{{version}}" "@freesewing/bent": "^{{version}}" "@freesewing/plugin-buttons": "^{{version}}" css-theme: @@ -115,8 +117,13 @@ gatsby-remark-jargon: _: "remark-jargon": "^{{version}}" holmes: + _: + "@freesewing/plugin-gore": "^{{version}}" peer: "@freesewing/plugin-bust": "^{{version}}" +huey: + peer: + "@freesewing/brian": "^{{version}}" hugo: peer: "@freesewing/brian": "^{{version}}" @@ -125,6 +132,7 @@ i18n: "@freesewing/pattern-info": "^{{version}}" jaeger: peer: + "@freesewing/brian": "^{{version}}" "@freesewing/bent": "^{{version}}" "@freesewing/plugin-buttons": "^{{version}}" models: diff --git a/packages/breanna/tests/pattern.test.js b/packages/breanna/tests/pattern.test.js deleted file mode 100644 index d34c44e97bf..00000000000 --- a/packages/breanna/tests/pattern.test.js +++ /dev/null @@ -1,6 +0,0 @@ -const patternTests = require('@freesewing/pattern-tests').allTests - -const pattern = require('../dist/') -const pkg = require('../package.json') - -patternTests(pattern, pkg) diff --git a/packages/brian/config/index.js b/packages/brian/config/index.js index 8a15e0c578f..dd0bd82d366 100644 --- a/packages/brian/config/index.js +++ b/packages/brian/config/index.js @@ -96,9 +96,9 @@ export default { sleevecapTopFactorX: { pct: 50, min: 25, max: 75 }, sleevecapTopFactorY: { pct: 100, min: 35, max: 165 }, sleevecapBackFactorX: { pct: 60, min: 35, max: 65 }, - sleevecapBackFactorY: { pct: 33, min: 35, max: 65 }, + sleevecapBackFactorY: { pct: 33, min: 30, max: 65 }, sleevecapFrontFactorX: { pct: 55, min: 35, max: 65 }, - sleevecapFrontFactorY: { pct: 33, min: 35, max: 65 }, + sleevecapFrontFactorY: { pct: 33, min: 30, max: 65 }, sleevecapQ1Offset: { pct: 3, min: 0, max: 7 }, sleevecapQ2Offset: { pct: 5.5, min: 0, max: 7 }, sleevecapQ3Offset: { pct: 4.5, min: 0, max: 7 }, diff --git a/packages/carlita/package.json b/packages/carlita/package.json index 3e624a41b17..7abe674a216 100644 --- a/packages/carlita/package.json +++ b/packages/carlita/package.json @@ -37,6 +37,7 @@ "peerDependencies": { "@freesewing/core": "^2.4.3", "@freesewing/plugin-bundle": "^2.4.3", + "@freesewing/brian": "^2.4.3", "@freesewing/bent": "^2.4.3", "@freesewing/carlton": "^2.4.3", "@freesewing/plugin-bust": "^2.4.3", diff --git a/packages/carlton/package.json b/packages/carlton/package.json index b627e97795b..52829d40593 100644 --- a/packages/carlton/package.json +++ b/packages/carlton/package.json @@ -37,6 +37,7 @@ "peerDependencies": { "@freesewing/core": "^2.4.3", "@freesewing/plugin-bundle": "^2.4.3", + "@freesewing/brian": "^2.4.3", "@freesewing/bent": "^2.4.3", "@freesewing/plugin-buttons": "^2.4.3" }, diff --git a/packages/fu/tests/pattern.test.js b/packages/fu/tests/pattern.test.js deleted file mode 100644 index d34c44e97bf..00000000000 --- a/packages/fu/tests/pattern.test.js +++ /dev/null @@ -1,6 +0,0 @@ -const patternTests = require('@freesewing/pattern-tests').allTests - -const pattern = require('../dist/') -const pkg = require('../package.json') - -patternTests(pattern, pkg) diff --git a/packages/holmes/package.json b/packages/holmes/package.json index 21566c93e96..17c5017db0b 100644 --- a/packages/holmes/package.json +++ b/packages/holmes/package.json @@ -39,7 +39,9 @@ "@freesewing/plugin-bundle": "^2.4.3", "@freesewing/plugin-bust": "^2.4.3" }, - "dependencies": {}, + "dependencies": { + "@freesewing/plugin-gore": "^2.4.3" + }, "devDependencies": { "react": "^16.8", "react-dom": "^16.8", diff --git a/packages/huey/package.json b/packages/huey/package.json index 3a78a1bdc1c..4fd80055673 100644 --- a/packages/huey/package.json +++ b/packages/huey/package.json @@ -36,7 +36,8 @@ }, "peerDependencies": { "@freesewing/core": "^2.4.3", - "@freesewing/plugin-bundle": "^2.4.3" + "@freesewing/plugin-bundle": "^2.4.3", + "@freesewing/brian": "^2.4.3" }, "dependencies": {}, "devDependencies": { diff --git a/packages/jaeger/package.json b/packages/jaeger/package.json index 0c35a7d381a..2113a7524a7 100644 --- a/packages/jaeger/package.json +++ b/packages/jaeger/package.json @@ -37,6 +37,7 @@ "peerDependencies": { "@freesewing/core": "^2.4.3", "@freesewing/plugin-bundle": "^2.4.3", + "@freesewing/brian": "^2.4.3", "@freesewing/bent": "^2.4.3", "@freesewing/plugin-buttons": "^2.4.3" }, diff --git a/tests/patterns/config.js b/tests/patterns/config.js index c37f3bc3911..7a382c28b00 100644 --- a/tests/patterns/config.js +++ b/tests/patterns/config.js @@ -68,30 +68,32 @@ const testPatternConfig = (design, pattern, expect, models, patterns) => { } - /* - * Ensure pattern is listed as being for breasts or not - */ - let breasts = false - it('Pattern should be listed as with or without breasts', () => { - let result = false - if (patterns.withBreasts.indexOf(design) !== -1) { - breasts = true - result = true - } else { - if (patterns.withoutBreasts.indexOf(design) !== -1) result = true - } - expect(result).to.be.true - }) - - - /* - * Ensure required measurements are known measurements - */ - it('Required measurements:' , () => true) - for (let measurement of pattern.config.measurements) { - it(` - '${measurement}' should be a known measurement`, () => { - expect(models.measurements[breasts ? 'womenswear' : 'menswear'].indexOf(measurement)).to.not.equal(-1) + if (['rendertest', 'tutorial'].indexOf(design) !== -1) { + /* + * Ensure pattern is listed as being for breasts or not + */ + let breasts = false + it('Pattern should be listed as with or without breasts', () => { + let result = false + if (patterns.withBreasts.indexOf(design) !== -1) { + breasts = true + result = true + } else { + if (patterns.withoutBreasts.indexOf(design) !== -1) result = true + } + expect(result).to.be.true }) + + + /* + * Ensure required measurements are known measurements + */ + it('Required measurements:' , () => true) + for (let measurement of pattern.config.measurements) { + it(` - '${measurement}' should be a known measurement`, () => { + expect(models.measurements[breasts ? 'womenswear' : 'menswear'].indexOf(measurement)).to.not.equal(-1) + }) + } } /*