Skip to content

Commit

Permalink
Updated develop (#1439)
Browse files Browse the repository at this point in the history
* Revert "set destination address for tokens"

* Update issue templates

* Update pull_request_template.md

* Update pull_request_template.md

* Update pull_request_template.md

* change command for start lint validation

* package.json: linter checks changed files before each commit

* исправил битую ссылку

* Update issue templates

* fix bad merge
  • Loading branch information
caffeinum committed Jan 30, 2019
1 parent fcd2a08 commit a4cde8a
Show file tree
Hide file tree
Showing 7 changed files with 73 additions and 17 deletions.
3 changes: 3 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-template.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
---
name: Bug Template
about: Bug Template. Every correct-formed issue gets +1 token bonus.
title: ''
labels: ''
assignees: ''

---

Expand Down
12 changes: 12 additions & 0 deletions .github/ISSUE_TEMPLATE/complex-manual-test.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
---
name: Complex Manual Test
about: выполнять желательно после каждого билда. Прошел тест? Улучши его, добавь чекбоксы
title: ''
labels: ''
assignees: ''

---

Expand Down Expand Up @@ -49,8 +52,17 @@ about: выполнять желательно после каждого бил
//todo

**прочие тесты (нужно расписать подробнее)**
- [ ] тест с альтернатив дестинейшин адрес
- [ ] тест с отсутсвием биткоина на счету
- [ ] тест с нулевыми балансами
- [ ] элемент "копировать адрес" работает
- [ ] элемент "обновить баланс" работает
- [ ] если двое одновременно пытаются стартануть со мной свап, то один из них отменится?
- [ ] Проверка кнопок социальных сетей
- [ ] Проверка кнопки уведомлений
- [ ] Проверка суммы переводов в историях
- [ ] Проверка возврата средств при истечении 180 минут при отмены подписания контракта
- [ ] Проверка актуальности ссылок в подвале сайта
- [ ] Проверка стандартной операции отправки валюты
- [ ] я добавил 1 чекбокс к этому тесту, чтоб улучшить покрытие
- [ ] я добавил 3 чекбокса к этому тесту, чтоб улучшить покрытие
3 changes: 3 additions & 0 deletions .github/ISSUE_TEMPLATE/improvement-template.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
---
name: Improvement Template
about: Improvement Template. Every correct-formed issue gets +1 token bonus.
title: ''
labels: ''
assignees: ''

---

Expand Down
3 changes: 3 additions & 0 deletions .github/ISSUE_TEMPLATE/new-blockchain-manual-test.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
name: New blockchain Manual Test
about: тесткейс который позволяет протестировать полностью работает ли обмен на новом
блокчейне
title: ''
labels: ''
assignees: ''

---

Expand Down
3 changes: 3 additions & 0 deletions .github/ISSUE_TEMPLATE/standart-task-template.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
name: Standart Task Template
about: шаблон правильного оформления таска (за правильно оформленный таск +1 токен
бонуса)
title: ''
labels: ''
assignees: ''

---

Expand Down
55 changes: 38 additions & 17 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,38 @@
# Template PR swap.react

`Build not working ? PR closed : Merge`

* Code matches style guide 😏
- [ ] [js](https://github.com/airbnb/javascript#ecmascript-6-es-2015-styles)
- [ ] [react](https://github.com/airbnb/javascript/tree/master/react)
- [ ] [css/sass](https://github.com/airbnb/css)
* PR description includes 😋
- [ ] issue number
- [ ] brief description of the work
- [ ] why you chose this solution
* Git 😈
- [ ] `git pull --rebase origin develop` [help](https://git-scm.com/book/en/v2/Git-Branching-Rebasing)

For the correct PR bonus tokens ✨
💔Thank you!
# Pull request template

## Checklist

<!-- You have to tick all the boxes -->

- [ ] I have read the [CONTRIBUTING](https://github.com/swaponline/swap.react/wiki/CONTRIBUTING) guide
- [ ] branch rebased on `develop`
- [ ] styleguide check `npm run validate`
- [ ] good naming
- [ ] keep simple
- [ ] video or screenshot attached
- [ ] testing instruction attached
- [ ] check your PR once again


### Description

<!-- Include issue number and motivation for these code changes -->




### Video or screenshot

<!-- Paste video or screenshots -->




### What and how to test

<!-- What reviewer should do? -->





11 changes: 11 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,17 @@
"description": "swap.online",
"private": true,
"main": "./bin/server",
"husky": {
"hooks": {
"pre-commit": "lint-staged"
}
},
"lint-staged": {
"*.js": [
"eslint --fix --cache ./shared --ext js",
"git add"
]
},
"scripts": {
"test": "cypress open",
"eslint": "eslint --fix --cache ./shared --ext js",
Expand Down

0 comments on commit a4cde8a

Please sign in to comment.