Commit Graph

284 Commits

Author SHA1 Message Date
Marvin Gay a0977c9295
Merge branch 'main' into km-testing-jest-2 2021-05-17 18:56:52 -04:00
Michael Frank 5708c3d85a Added jest
Removed generator-exercises folder as it breaks jest-codemods

run jest-codemods on .spec.js files, move generator-exercises back in

Change references from Jasmine to Jest in main readme

Update README with Jest specific language. Update some spec files with new syntax

update tests, multiple exercises

.gitignore: Added package-lock.json, package.json that were used when I ran code-blocks over the tests.

Standardised function declaration calls across exercises

fix typo in caesar.spec.js

Ignoring package-lock.json, package.json

Backtrack on .gitignore modification, add instructions to readme

move files from testing repo to this repo

Typo fixes, remove duplicate exercise folder

Remove solution from non-solution branch

Minor grammatical fixes

added trailing semicolon to all function and module exports

Fix words caught by search/replace action.

remove doubled semicolon.

Correct words caught by search/replace action.

Add missing semicolon.

Add .DS_Store to .gitignore

multiple files: Added a blank line at the end of each file

Ignore generator-exercise when linting exercise files

Update exercise number of each exercise

Update exercise number
2021-05-17 23:46:49 +01:00
Marvin Gay ad1c0c407f Revert "Merge branch 'jest'"
This reverts commit f76e9e108f.
2021-05-12 22:10:23 -04:00
Marvin Gay f76e9e108f Merge branch 'jest' 2021-05-12 21:47:42 -04:00
Marvin Gay 8430e59fe4 Merge branch 'origin/master' into 'jest' 2021-05-12 21:45:11 -04:00
Michael Frank 14f9b662de Update exercise number 2021-05-12 21:20:58 +12:00
Michael Frank 321e943041 Update exercise number of each exercise 2021-05-12 19:39:31 +12:00
Michael Frank 26ac56f75d Ignore generator-exercise when linting exercise files 2021-05-12 19:39:05 +12:00
Michael Frank 8b753de1d1 multiple files: Added a blank line at the end of each file 2021-05-12 19:37:53 +12:00
Michael Frank 03d7fe251a Add .DS_Store to .gitignore 2021-05-11 14:34:39 +12:00
Michael Frank 87e9d0eabc Add missing semicolon. 2021-05-11 14:29:44 +12:00
Michael Frank e454dfb35d Correct words caught by search/replace action. 2021-05-11 14:29:15 +12:00
Michael Frank b673a53a1e remove doubled semicolon. 2021-05-11 14:28:37 +12:00
Michael Frank 29bcae0032 Fix words caught by search/replace action. 2021-05-11 14:27:33 +12:00
Michael Frank 2f63b3e380 added trailing semicolon to all function and module exports 2021-05-10 21:27:55 +12:00
Michael Frank 58d2eb108a Minor grammatical fixes 2021-05-09 22:08:25 +12:00
Tatiana f238dee4ef
Merge pull request #142 from kemonprogrammer/patch-1
Correct exercise number
2021-05-08 11:45:45 -07:00
Tatiana ba07cb9396
Merge pull request #134 from plskz/fix-link
Fix broken link
2021-05-08 11:44:22 -07:00
dependabot[bot] d3c6a5d061
Bump hosted-git-info from 2.5.0 to 2.8.9 in /generator-exercise
Bumps [hosted-git-info](https://github.com/npm/hosted-git-info) from 2.5.0 to 2.8.9.
- [Release notes](https://github.com/npm/hosted-git-info/releases)
- [Changelog](https://github.com/npm/hosted-git-info/blob/v2.8.9/CHANGELOG.md)
- [Commits](https://github.com/npm/hosted-git-info/compare/v2.5.0...v2.8.9)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-08 18:38:44 +00:00
Tatiana ac73d925a3
Merge pull request #145 from TheOdinProject/fix/revert-jest
Fix/revert jest
2021-05-08 11:37:46 -07:00
Tatiana 8272bde6c9 Revert "Merge pull request #124 from TheOdinProject/twalton83-patch-1"
This reverts commit 42076e7424, reversing
changes made to 452caf2783.
2021-05-08 11:33:40 -07:00
Tatiana ffb5d83187 Revert "Added jest"
This reverts commit b8b23686e3.
2021-05-08 11:33:11 -07:00
Tatiana ee85d606fd Revert "Removed generator-exercises folder as it breaks jest-codemods"
This reverts commit ecd82a4d52.
2021-05-08 11:32:47 -07:00
Tatiana 4efb36f3aa Revert "run jest-codemods on .spec.js files, move generator-exercises back in"
This reverts commit 7a001e0fdb.
2021-05-08 11:32:41 -07:00
Tatiana d79bdb9312 Revert "Change references from Jasmine to Jest in main readme"
This reverts commit 91d50288b2.
2021-05-08 11:32:26 -07:00
Tatiana cb3ffc086c Revert "Update README with Jest specific language. Update some spec files with new syntax"
This reverts commit e73c68fc01.
2021-05-08 11:31:56 -07:00
Tatiana e6260ae506 Revert "ignoring node_modules"
This reverts commit b9983073cc.
2021-05-08 11:31:21 -07:00
Tatiana 674fcf8e56 Revert "update tests, multiple exercises"
This reverts commit 2eb02ea212.
2021-05-08 11:31:02 -07:00
Tatiana eec196df17 Revert ".gitignore: Added package-lock.json, package.json that were used when I ran code-blocks over the tests."
This reverts commit c1b27dc68e.
2021-05-08 11:30:02 -07:00
Tatiana 405b47c452 Revert "Standardised function declaration calls across exercises"
This reverts commit 791a579823.
2021-05-08 11:29:43 -07:00
Tatiana 8b6d46300c Revert "Update .gitignore"
This reverts commit 3faff54b7e.
2021-05-08 11:29:14 -07:00
Tatiana e691edc97c Revert "Merge pull request #1 from xandora/jester-tester"
This reverts commit e901090896, reversing
changes made to 42076e7424.
2021-05-08 11:28:50 -07:00
Tatiana b2f2211321 Revert "Resolve merge conflicts"
This reverts commit 61338e0ca0, reversing
changes made to b9983073cc.
2021-05-08 11:27:13 -07:00
Tatiana 18cffeb940 Revert "update cloning link"
This reverts commit 4c771f2e05.
2021-05-08 11:25:04 -07:00
Tatiana 60fe6c8b1f Revert "fix the ignoring of node_modules"
This reverts commit 3423e2f6cf.
2021-05-08 11:15:56 -07:00
Tatiana 2537c2e6e2 Revert "remove node_modules"
This reverts commit 2fb5731f23.
2021-05-08 11:15:45 -07:00
Michael Frank 2fb5731f23 remove node_modules 2021-05-09 00:43:44 +12:00
Michael Frank 3423e2f6cf fix the ignoring of node_modules 2021-05-09 00:41:55 +12:00
Michael Frank d28d80c46f Clean up the oopsie. Rebuild the blank exercises. 2021-05-09 00:39:21 +12:00
Michael Frank b984cb4c6f Merge branch 'master' of TOP/javascript-exercises 2021-05-09 00:29:44 +12:00
xandora e6a0bb03a5
Merge branch 'solutions' into master 2021-05-09 00:10:19 +12:00
Michael 16760dae39
Correct exercise number 2021-05-06 19:56:48 +02:00
dependabot[bot] 76ccc33cc5
Bump lodash from 4.17.4 to 4.17.21 in /generator-exercise
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.4 to 4.17.21.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.4...4.17.21)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-06 17:51:04 +00:00
dependabot[bot] 4a220a6d55
Bump handlebars from 4.0.10 to 4.7.7 in /generator-exercise
Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.0.10 to 4.7.7.
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/handlebars-lang/handlebars.js/blob/master/release-notes.md)
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.0.10...v4.7.7)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-06 16:28:44 +00:00
dependabot[bot] cdfa24b1cf
Bump merge from 1.2.0 to 1.2.1 in /generator-exercise
Bumps [merge](https://github.com/yeikos/js.merge) from 1.2.0 to 1.2.1.
- [Release notes](https://github.com/yeikos/js.merge/releases)
- [Commits](https://github.com/yeikos/js.merge/compare/v1.2.0...v1.2.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-05-04 20:27:20 +00:00
Michael Frank d677c68c28 Remove solution from non-solution branch 2021-04-30 22:26:35 +12:00
Michael Frank febe6522f3 Typo fixes, remove duplicate exercise folder 2021-04-30 21:54:46 +12:00
Michael Frank 35d7948aa2 move files from testing repo to this repo 2021-04-30 21:49:46 +12:00
Michael Frank fb304675d8 Backtrack on .gitignore modification, add instructions to readme 2021-04-30 00:01:06 +12:00
Michael Frank eec46c7577 Ignoring package-lock.json, package.json 2021-04-29 23:59:53 +12:00