diff --git a/.canvas b/.canvas index c5cd096e8..4a71f6e64 100644 --- a/.canvas +++ b/.canvas @@ -1,6 +1,10 @@ --- :lessons: -- :id: 73909 - :course_id: 3297 - :canvas_url: https://learning.flatironschool.com/courses/3297/assignments/73909 +- :id: 223923 + :course_id: 6638 + :canvas_url: https://learning.flatironschool.com/courses/6638/assignments/223923 + :type: assignment +- :id: 263276 + :course_id: 7550 + :canvas_url: https://learning.flatironschool.com/courses/7550/assignments/263276 :type: assignment diff --git a/.github/workflows/canvas-sync-html.yml b/.github/workflows/canvas-sync-ruby-update.yml similarity index 71% rename from .github/workflows/canvas-sync-html.yml rename to .github/workflows/canvas-sync-ruby-update.yml index a4e40c121..f8818dc0c 100644 --- a/.github/workflows/canvas-sync-html.yml +++ b/.github/workflows/canvas-sync-ruby-update.yml @@ -1,10 +1,10 @@ -name: Sync with Canvas HTML +name: Sync with Canvas Ruby v2.7 on: push: branches: [master, main] paths: - - "README.md" + - 'README.md' jobs: sync: @@ -18,14 +18,14 @@ jobs: - name: Set up Ruby uses: ruby/setup-ruby@v1 with: - ruby-version: 2.6 + ruby-version: 2.7 - name: Install github-to-canvas run: gem install github-to-canvas # Secret stored in learn-co-curriculum Settings/Secrets - name: Sync from .canvas file - run: github-to-canvas -a -lr --forkable --contains-html + run: github-to-canvas -a -lr env: CANVAS_API_KEY: ${{ secrets.CANVAS_API_KEY }} - CANVAS_API_PATH: ${{ secrets.CANVAS_API_PATH }} \ No newline at end of file + CANVAS_API_PATH: ${{ secrets.CANVAS_API_PATH }} diff --git a/README.md b/README.md index 0ea5bdfb0..b3a1aa4f1 100644 --- a/README.md +++ b/README.md @@ -15,9 +15,15 @@ the user experience by adding some custom greeting capabilities. ## Work Through Failing Tests in a JavaScript Test Suite -To start off, let's run the test suite with the `learn test` command. Our code -is currently failing all of the tests, but we expected that because we haven't -done anything yet. Let's get to work! +If you haven't already, fork and clone this lab into your local environment. +Remember to **fork** a copy into your GitHub account first, then **clone** from +that copy. Navigate into its directory in the terminal, then run `code .` to +open the files in Visual Studio Code. + +Next, let's run `npm install` to install the dependencies then run the test +suite with the `npm test` command. Our code is currently failing all of the +tests, but we expected that because we haven't done anything yet. Let's get to +work! ### `currentUser` @@ -409,6 +415,13 @@ const currentUser = 'Grace Hopper'; const shortGreeting = `Welcome, ${currentUser.slice(0, 1)}!`; ``` +After you have all the tests passing, remember to commit and push your changes +up to GitHub, then submit your work to Canvas using CodeGrade. If you need a +reminder, go back to the [Completing and Submitting Assignments with +CodeGrade][completing-codegrade] lesson to review the process. + +[completing-codegrade]: https://github.com/learn-co-curriculum/phase-1-completing-assignments-with-codegrade + Great work! ## Resources diff --git a/index.js b/index.js index 96427a583..62fd9d036 100644 --- a/index.js +++ b/index.js @@ -1 +1,4 @@ -// Write your code in this file! +let currentUser = 'Grace Hopper'; +const welcomeMessage = 'Welcome to Flatbook, ' + currentUser + '!'; +const excitedWelcomeMessage = welcomeMessage.toUpperCase(); +const shortGreeting = `Welcome, ${currentUser.slice(0, 1)}!`; \ No newline at end of file diff --git a/package.json b/package.json index 7e6cee914..2d4342e4f 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,6 @@ "description": "JavaScript Strings Code-along for Learn.co", "main": "index.js", "scripts": { - "postinstall": "gem install learn-co", "test": "mocha --timeout 5000 -R mocha-multi --reporter-options spec=-,json=.results.json" }, "repository": { diff --git a/test/indexTest.js b/test/indexTest.js index a1cf4f34b..8c126ee3e 100644 --- a/test/indexTest.js +++ b/test/indexTest.js @@ -1,3 +1,5 @@ +require ( './helpers.js' ); + describe('index.js', () => { describe('currentUser', () => { it('is defined', () => {