Skip to content

Commit

Permalink
Update gulp-eslint package
Browse files Browse the repository at this point in the history
  • Loading branch information
tuchfarber committed Jan 15, 2021
1 parent 615dde2 commit de11fd0
Show file tree
Hide file tree
Showing 6 changed files with 623 additions and 560 deletions.
3 changes: 3 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
.cache
.coverage
.git
.pytest_cache
.tox
coverage
coverage.xml
geckodriver.log
htmlcov
node_modules
venv
webpack-stats.json
6 changes: 4 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,10 @@
"env": {
"jest": true
},
"sourceType": "module",
"ecmaVersion": "2017",
"parserOptions": {
"sourceType": "module",
"ecmaVersion": 2017
},
"globals": {
"FB": true,
"gettext": true,
Expand Down
1 change: 0 additions & 1 deletion Dockerfile-testing
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,3 @@ COPY ./package.json /edx/app/credentials/package.json
COPY ./package-lock.json /edx/app/credentials/package-lock.json
COPY ./Makefile /edx/app/credentials/Makefile
RUN make requirements
COPY . /edx/app/credentials
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ all-requirements: piptools ## Install local and prod requirements
pip-sync requirements/all.txt

requirements: piptools ## Install requirements for local development
npm install
npm install --also=dev
pip-sync requirements/dev.txt

piptools:
Expand Down Expand Up @@ -165,12 +165,12 @@ build_test_image: # Builds Docker image used for testing so devs don't need to i

# This should be ran locally, not inside of the devstack container
acceptance_tests_suite: build_test_image
docker run -e "TERM=xterm-256color" credentials:local bash -c 'cd /edx/app/credentials/ && make static && make accept'
docker run -e "TERM=xterm-256color" -v `pwd`:/edx/app/credentials/ --read-only credentials:local bash -c 'cd /edx/app/credentials/ && make static && make accept'

# This should be ran locally, not inside of the devstack container
quality_and_translations_tests_suite: build_test_image
docker run -e "TERM=xterm-256color" credentials:local bash -c 'cd /edx/app/credentials/ && make check_translations_up_to_date && make validate_translations && make quality && make check_keywords && make pii_check'
docker run -e "TERM=xterm-256color" -v `pwd`:/edx/app/credentials/ credentials:local bash -c 'cd /edx/app/credentials/ && make check_translations_up_to_date && make validate_translations && make quality && make check_keywords && make pii_check'

# This should be ran locally, not inside of the devstack container
unit_tests_suite: build_test_image
docker run -e "TERM=xterm-256color" credentials:local bash -c 'cd /edx/app/credentials/ && make static && make tests && make coverage'
docker run -e "TERM=xterm-256color" -v `pwd`:/edx/app/credentials/ credentials:local bash -c 'cd /edx/app/credentials/ && make static && make tests && make coverage'
Loading

0 comments on commit de11fd0

Please sign in to comment.