From cb3ffc086cbf100496756970192a89eaa909ab29 Mon Sep 17 00:00:00 2001 From: Tatiana Date: Sat, 8 May 2021 11:31:56 -0700 Subject: [PATCH] Revert "Update README with Jest specific language. Update some spec files with new syntax" This reverts commit e73c68fc01d29f9ac6e68eca1e202e33dc301324. --- README.md | 4 ++-- caesar/caesar.spec.js | 31 +++++++++++++++---------------- helloWorld/helloWorld.js | 2 +- helloWorld/helloWorld.spec.js | 8 +++----- leapYears/leapYears.spec.js | 3 +-- 5 files changed, 22 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 4cf2e4b..399dc2f 100644 --- a/README.md +++ b/README.md @@ -9,10 +9,10 @@ There will eventually be a suggested order of completion, but at this time since ## How To Use These Exercises Before you start you should have a few things installed on your machine: 1. NPM. To check if you have NPM installed, type `npm --version` in your terminal. If you get back `Command 'npm' not found, but can be installed with:`, do NOT follow the instructions in the terminal to install with `apt-get`. (This causes permission issues.) Instead, install Node with NVM by following the instructions [here](https://github.com/TheOdinProject/curriculum/blob/master/foundations/installations/installing_node.md). -2. Jasmine. Jasmine is a testing framework for JavaScript. Type `jasmine -v` to check for it. If you need to install it, type `npm install -g jasmine` to do so. +2. Jest. Jest is a testing framework for JavaScript. To install it, type `npm install --save-dev jest`. We use `--save-dev` here to specify this module is for development purposes only. 3. A copy of this repository. Copies of repositories on your machine are called clones. If you need help cloning, you can learn how [here](https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/cloning-a-repository) -Each exercise includes 3 files: a markdown file with a description of the task, an empty (or mostly empty) JavaScript file, and a set of tests. To complete an exercise, you'll need to go to the exercise directory with `cd exerciseName` in the terminal and run `jasmine exerciseName.spec.js`. This should run the test file and show you the output. When you first run a test, it will fail. This is by design! You must open the exercise file and write the code needed to get the test to pass. Some of the exercises have test conditions defined in their spec file that are defined as 'xit' compared to 'it'. This is purposeful. After you pass your first 'it', you will change the next 'xit' to an 'it' and test your code again. You'll do this until all conditions are satisfied. +Each exercise includes 3 files: a markdown file with a description of the task, an empty (or mostly empty) JavaScript file, and a set of tests. To complete an exercise, you'll need to go to the exercise directory with `cd exerciseName` in the terminal and run `npm test exerciseName.spec.js`. This should run the test file and show you the output. When you first run a test, it will fail. This is by design! You must open the exercise file and write the code needed to get the test to pass. Some of the exercises have test conditions defined in their spec file that are defined as 'xit' compared to 'it'. This is purposeful. After you pass your first 'it', you will change the next 'xit' to an 'it' and test your code again. You'll do this until all conditions are satisfied. The first exercise, `helloWorld`, will walk you through the process in-depth. diff --git a/caesar/caesar.spec.js b/caesar/caesar.spec.js index 24de84c..d066581 100644 --- a/caesar/caesar.spec.js +++ b/caesar/caesar.spec.js @@ -1,26 +1,25 @@ -const expect = require('expect'); -const caesar = require('./caesar') +const expect = require('expect');const caesar = require('./caesar') describe('caesar', function() { - test('works with single letters', function() { - expect(caesar('A', 1)).toBe('B'); + it('works with single letters', function() { + expect(caesar('A', 1)).toEqual('B'); }); - test.skip('works with words', function() { - expect(caesar('Aaa', 1)).toBe('Bbb'); + xit('works with words', function() { + expect(caesar('Aaa', 1)).toEqual('Bbb'); }); - test.skip('works with phrases', function() { - expect(caesar('Hello, World!', 5)).toBe('Mjqqt, Btwqi!'); + xit('works with phrases', function() { + expect(caesar('Hello, World!', 5)).toEqual('Mjqqt, Btwqi!'); }); - test.skip('works with negative shift', function() { - expect(caesar('Mjqqt, Btwqi!', -5)).toBe('Hello, World!'); + xit('works with negative shift', function() { + expect(caesar('Mjqqt, Btwqi!', -5)).toEqual('Hello, World!'); }); - test.skip('wraps', function() { - expect(caesar('Z', 1)).toBe('A'); + xit('wraps', function() { + expect(caesar('Z', 1)).toEqual('A'); }); - test.skip('works with large shift factors', function() { - expect(caesar('Hello, World!', 75)).toBe('Ebiil, Tloia!'); + xit('works with large shift factors', function() { + expect(caesar('Hello, World!', 75)).toEqual('Ebiil, Tloia!'); }); - test.skip('works with large negative shift factors', function() { - expect(caesar('Hello, World!', -29)).toBe('Ebiil, Tloia!'); + xit('works with large negative shift factors', function() { + expect(caesar('Hello, World!', -29)).toEqual('Ebiil, Tloia!'); }); }); diff --git a/helloWorld/helloWorld.js b/helloWorld/helloWorld.js index bdd1356..a41264d 100644 --- a/helloWorld/helloWorld.js +++ b/helloWorld/helloWorld.js @@ -1,5 +1,5 @@ const helloWorld = function() { - return 'Yello Wold!' + return '' } module.exports = helloWorld diff --git a/helloWorld/helloWorld.spec.js b/helloWorld/helloWorld.spec.js index 50e69dd..bac0b73 100644 --- a/helloWorld/helloWorld.spec.js +++ b/helloWorld/helloWorld.spec.js @@ -1,4 +1,4 @@ -const expect = require('expect'); +const expect = require('expect');const { expect } = require('@jest/globals'); const helloWorld = require('./helloWorld'); // describe('Hello World', function() { @@ -7,8 +7,6 @@ const helloWorld = require('./helloWorld'); // }); // }); -describe('helloWorld', function() { - test('says "Hello, World!"', function() { - expect(helloWorld()).toBe("Hello, World!"); - }) +test('says "Hello, World!"', () => { + expect(helloWorld()).toBe("Hello, World!"); }); diff --git a/leapYears/leapYears.spec.js b/leapYears/leapYears.spec.js index 5c3a36b..46e1d48 100644 --- a/leapYears/leapYears.spec.js +++ b/leapYears/leapYears.spec.js @@ -1,5 +1,4 @@ -const expect = require('expect'); -const leapYears = require('./leapYears') +const expect = require('expect');const leapYears = require('./leapYears') describe('leapYears', function() { it('works with non century years', function() {