Skip to content

Commit

Permalink
Merge pull request #282 from globe-and-citizen/develop
Browse files Browse the repository at this point in the history
Release 1.6
  • Loading branch information
arnonrdp authored Jul 25, 2023
2 parents cdc8aaa + fc1d202 commit ee76c8b
Show file tree
Hide file tree
Showing 59 changed files with 2,273 additions and 2,603 deletions.
21 changes: 0 additions & 21 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,3 @@ Please, include:
-->

## Description

INSERT YOUR DESCRIPTION HERE.

---

Before requesting a review of this Pull Request, I have certified that I have tested the following items in the application and all have passed my local tests without any side effects:

- [x] Logout and login;
- [x] Navigation between pages;
- [ ] Creation of a new prompt;
- [ ] Creation of a new entry;
- [x] Like and Dislike button;
- [ ] Share button;
- [ ] Exclusion of the newly created prompt;
- [ ] Deletion of the newly created entry;

---

<!--
The review can be done after checking all items.
-->
76 changes: 76 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: 'CodeQL'

on:
push:
branches: ['develop']
pull_request:
# The branches below must be a subset of the branches above
branches: ['main', 'develop']
schedule:
- cron: '27 10 * * 0'

jobs:
analyze:
name: Analyze
runs-on: 'ubuntu-latest'
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: ['javascript']
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby', 'swift' ]
# Use only 'java' to analyze code written in Java, Kotlin or both
# Use only 'javascript' to analyze code written in JavaScript, TypeScript or both
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support

steps:
- name: 🛫 Checkout
uses: actions/checkout@v3

# Initializes the CodeQL tools for scanning.
- name: 🏗 Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.

# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality

# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
# If this step fails, then you should remove it and run the build manually (see below)
- name: 🧱 Autobuild
uses: github/codeql-action/autobuild@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun

# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.

# - run: |
# echo "Run, Build Application using script"
# ./location_of_script_within_repo/buildscript.sh

- name: 💻 Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
with:
upload: False
output: sarif-results
3 changes: 1 addition & 2 deletions .github/workflows/cypress.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
with:
start: npm run dev:e2e
wait-on: http://localhost:9200/
browser: firefox
browser: chrome
headed: true
record: true
parallel: true
Expand All @@ -37,5 +37,4 @@ jobs:
- name: ✅ Upload coverage to Codecov
uses: codecov/codecov-action@v2
with:
# directory: ./.nyc_output/
flags: E2E
7 changes: 1 addition & 6 deletions .github/workflows/vitest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,9 @@ jobs:
cache: 'npm'

- name: 💻 Run Vitest
env:
VITE_RELEASE_STAGE: testing
run: |
npm ci
npm install --save firebase-tools
nohup npm run emulators &> emulators.log &
sleep 1m
npm run test:unit:coverage
npm run vitest:coverage
- name: ✅ Upload coverage to Codecov
uses: codecov/codecov-action@v2
Expand Down
4 changes: 1 addition & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,13 @@ For that, you need to run the tests:
#### Unit test

```bash
npm install -g firebase-tools # In case you don't have firebase-tools installed
npm run emulators
npm run test
```

#### E2E test

```bash
npm run dev # In case you don't have firebase-tools installed
npm run dev
npm run cy:open
```

Expand Down
Loading

0 comments on commit ee76c8b

Please sign in to comment.