diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 78b908d9..ab8eabd5 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,5 +1,8 @@ ## Description + + + --- @@ -7,9 +10,8 @@ -- [ ] A clear title +- [ ] A clear title (name your pr "[LAB{lab_number}] {your_student_id}") - [ ] A meaningful message for PR, as well as its commits -- [ ] From your specific branch (***not master***) merging to your branch +- [ ] From your specific branch (***not main or other's branch***) merging to your branch - [ ] Excluding any irrelevant files, such as binaries, text files, or dot files - [ ] Passing tests/CI -- [ ] Add proper label for this PR diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml new file mode 100644 index 00000000..4e7902a5 --- /dev/null +++ b/.github/workflows/label.yml @@ -0,0 +1,24 @@ +name: Automatic PR Labeler +on: + pull_request_target: + types: [opened, reopened, edited] + +jobs: + labeler: + runs-on: ubuntu-latest + steps: + - name: Label PR + uses: actions/github-script@v5 + with: + github-token: ${{ secrets.PAT }} + script: | + const { owner, repo, number: issue_number } = context.issue; + const pr = await github.rest.pulls.get({ owner, repo, pull_number: issue_number }); + const title = pr.data.title; + const labRegex = /\[LAB(\d+)\]/i; + + const match = title.match(labRegex); + if (match) { + const labelToAdd = 'lab' + match[1]; + await github.rest.issues.addLabels({ owner, repo, issue_number, labels: [labelToAdd] }); + } diff --git a/lab1/README.md b/lab1/README.md index f205b0b9..779166ca 100644 --- a/lab1/README.md +++ b/lab1/README.md @@ -6,8 +6,7 @@ In this lab, you will write unit tests for functions implemented in `main.js`. Y ## Requirement -1. Write test cases in `main_test.js` and achieve 100% code coverage. (90%) -2. Add a badge and make it show `passing` in `README.md` in the root folder. (10%) +1. Write test cases in `main_test.js` and achieve 100% code coverage. (100%) You can run `validate.sh` in your local to test if you satisfy the requirements. diff --git a/lab1/main_test.js b/lab1/main_test.js index 74a716b4..b843011e 100644 --- a/lab1/main_test.js +++ b/lab1/main_test.js @@ -3,21 +3,45 @@ const assert = require('assert'); const { MyClass, Student } = require('./main'); test("Test MyClass's addStudent", () => { - // TODO - throw new Error("Test not implemented"); + const myClass = new MyClass(); + const jason = new Student(); + const mary = new Student(); + assert.strictEqual(0, myClass.addStudent(jason)); + assert.strictEqual(1, myClass.addStudent(mary)); + assert.strictEqual(-1, myClass.addStudent(123)); }); test("Test MyClass's getStudentById", () => { - // TODO - throw new Error("Test not implemented"); + const myClass = new MyClass(); + const student = new Student(); + const names = ['John', 'Jane', 'Doe', 'Smith']; + names.forEach(name => { + const student = new Student(); + student.setName(name); + const newStudentId = myClass.addStudent(student); + const newStudentName = myClass.getStudentById(newStudentId).getName(); + }); + assert.strictEqual(myClass.getStudentById(-2), null); + assert.strictEqual(myClass.getStudentById(0).getName(), 'John'); + assert.strictEqual(myClass.getStudentById(1).getName(), 'Jane'); + assert.strictEqual(myClass.getStudentById(2).getName(), 'Doe'); + assert.strictEqual(myClass.getStudentById(3).getName(), 'Smith'); + assert.strictEqual(myClass.getStudentById(4), null); }); test("Test Student's setName", () => { - // TODO - throw new Error("Test not implemented"); + const student1 = new Student(); + const student2 = new Student(); + student1.setName('Jason') + assert.strictEqual(student1.name, 'Jason'); + student2.setName(234); + assert.strictEqual(student2.name, undefined); }); test("Test Student's getName", () => { - // TODO - throw new Error("Test not implemented"); + const student1 = new Student(); + const student2 = new Student(); + student1.setName('Mary'); + assert.strictEqual(student1.getName(), 'Mary'); + assert.strictEqual(student2.getName(), ''); }); \ No newline at end of file diff --git a/lab1/validate.sh b/lab1/validate.sh index dca233b1..d64ed954 100755 --- a/lab1/validate.sh +++ b/lab1/validate.sh @@ -9,7 +9,7 @@ cd $tmp_dir rm -rf * cp $solution_path/*.js . -result=$($node --test --experimental-test-coverage) ; ret=$? +result=$($"node" --test --experimental-test-coverage) ; ret=$? if [ $ret -ne 0 ] ; then echo "[!] testing fails" exit 1 diff --git a/scripts/rebase-all.sh b/scripts/rebase-all.sh new file mode 100644 index 00000000..26eef16b --- /dev/null +++ b/scripts/rebase-all.sh @@ -0,0 +1,29 @@ +#!/bin/bash + +git fetch origin + +for branch in $(git branch -r | grep -v HEAD); do + # Remove the "origin/" prefix + branch=${branch#origin/} + + if [[ "$branch" != "main" ]]; then + git checkout "$branch" + if [[ $? -ne 0 ]]; then + echo "Checkout failed for branch $branch" + exit 1 + fi + git pull origin "$branch" + if [[ $? -ne 0 ]]; then + echo "Pull failed for branch $branch" + exit 1 + fi + git rebase main + if [[ $? -ne 0 ]]; then + echo "Rebase failed for branch $branch" + exit 1 + fi + git push origin "$branch" + fi +done + +git checkout main \ No newline at end of file