Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix generator function #187

Closed
wants to merge 35 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
afa358c
Убрал символы цветов из репорта, добавил отображение ассертов кодсепта
Jun 24, 2016
ce87f07
убрал логирование
Jun 24, 2016
e16228c
добавил в стактрейс сообщение об ошибке codeceptjs
Jun 24, 2016
35782e1
Добавил отображение скриншотов в репорте
Jun 24, 2016
45f2961
убрал логирование
Jun 24, 2016
d63627e
убрал логирование
Jun 24, 2016
93add22
Добавил в стактрейс саму ошибку
Jun 24, 2016
73062e9
Поправил ошибку отображения ненайденных элементов
Jun 28, 2016
eb51cf2
убрал лишнюю скобку
Jun 28, 2016
e214137
Убрал футер чтобы не мешался в GO
Jul 18, 2016
5af491d
Пробуем задать высоту iframe
Jul 22, 2016
b5da4d2
Поправил расширение Iframe
Aug 1, 2016
ba7f22d
Поправил отображение выполненных тестов
Aug 1, 2016
67b7cba
missed )
Aug 1, 2016
3d9d4ab
правки
Aug 1, 2016
3dcf092
правки
Aug 1, 2016
d03d755
поправил отображение процентов
Aug 1, 2016
0a185b0
корректное отображение тест сьютов и количества тестов
Aug 1, 2016
640bebe
Вывод информации о браузере, разрешении и baseurl
Aug 1, 2016
28c51ca
fix for new CodeceptJs version
Sep 22, 2016
72b54d7
fix view
Sep 23, 2016
6156384
Fix
Sep 23, 2016
5fef351
fix
Sep 23, 2016
cab8444
fix
Sep 23, 2016
39cdd48
fix
Sep 23, 2016
f43fb04
fix
Sep 23, 2016
eedccea
Fix
Sep 23, 2016
4f18f07
fix displaying
Sep 23, 2016
4bc3ebc
Merge pull request #1 from APshenkin/codeceptJS
Oct 4, 2016
9920080
use hashCode
Nov 23, 2016
d6aa7e2
fix
Dec 9, 2016
c6ed74d
fix
Dec 14, 2016
ccf0f63
fix
Dec 14, 2016
a06cb25
sync fork
Sep 15, 2017
f993f05
fix generators function display
Sep 15, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
sync fork
  • Loading branch information
Pshenkin Andrey committed Sep 15, 2017
commit a06cb250fba5001fc13b34c0efdae0a3e63caabd
11 changes: 11 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"presets": [ "es2015", "stage-3" ],
"plugins": [
"transform-runtime"
],
"env": {
"test": {
"plugins": [ "istanbul" ]
}
}
}
36 changes: 29 additions & 7 deletions .codeclimate.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,30 @@
languages:
JavaScript: true
---
engines:
duplication:
enabled: true
config:
languages:
javascript:
mass_threshold: 90
eslint:
enabled: true
channel: "eslint-3"
config:
extensions:
- ".js"
fixme:
enabled: true
ratings:
paths:
- "**.js"
exclude_paths:
- "gulpfile.js"
- "src/js/lodash.custom.js"
- "dist/js/*.js"
- "test/*"
- "lib/templates.js"
- dist/
- .nyc_output/
- _site/
- coverage/
- docs/
- test/
- test-functional/
- test-programmatic/
- test/sample-suite.js
- test/sample-tests.js
48 changes: 48 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{
"extends": "airbnb-base",
"globals": {
"Promise": true,
"should": true,
"Map": true
},
"env": {
"node": true,
"mocha": true
},
"rules": {
"arrow-parens": [2, "as-needed"],
"brace-style": [2, "1tbs"],
"comma-style": [2, "last"],
"curly": [2, "multi-line"],
"quotes": [2, "single"],
"camelcase": 0,
"no-debugger": 2,
"no-undef": 2,
"no-underscore-dangle": 0,
"no-mixed-requires": 0,
"max-len": [1, 120, 2, {ignoreComments: true}],
"quote-props": [1, "consistent-as-needed"],
"no-cond-assign": [2, "except-parens"],
"radix": 0,
"space-infix-ops": 0,
"no-unused-vars": [1, {"vars": "local", "args": "none"}],
"default-case": 0,
"no-param-reassign": 0,
"comma-dangle": [2, "never"],
"indent": [2, 2],
"object-curly-spacing": [2, "always"],
"array-bracket-spacing": [2, "always"],
"func-names": 0,
"no-else-return": 0,
"no-console": 0,
"no-throw-literal": 0,
"no-plusplus": [2, { "allowForLoopAfterthoughts": true }],
"id-length": 0,
"no-unused-expressions": 0,
"no-confusing-arrow": 0,
"semi": [1, "always"],
"global-require": 0,
"import/no-unresolved": 0,
"import/no-extraneous-dependencies": 0
}
}
26 changes: 7 additions & 19 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,21 +1,9 @@
.DS_Store
lib-cov
*.seed
*.log
*.csv
*.dat
*.out
*.pid
*.gz

pids
logs
results

node_modules

mochawesome-reports

npm-debug.log

_site/
node_modules/
mochawesome-reports/
mochawesome-report/
_site/
coverage/
.nyc_output/
dist/
92 changes: 0 additions & 92 deletions .jshintrc

This file was deleted.

11 changes: 8 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
language: node_js
node_js:
- "0.10"
- "0.12"
- "4"
- "5"
- "5"
- "6"
addons:
code_climate:
repo_token: 1a650700393c767904fc318ba4e936e72d348ab9d924f4a3e53bdba9d87a4ec6
after_script:
- npm install -g codeclimate-test-reporter
- codeclimate-test-reporter < ./coverage/lcov.info
107 changes: 90 additions & 17 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,54 +1,127 @@
#Changelog
# Changelog

###1.3.5
### [2.3.0](https://github.com/adamgruber/mochawesome/releases/tag/2.3.0)
- Added `showHooks` option [#168](https://github.com/adamgruber/mochawesome/pull/168)
- Support mocha's `--inline-diffs` option [#167](https://github.com/adamgruber/mochawesome/pull/167)
- Normalize error objects for consistent display [#166](https://github.com/adamgruber/mochawesome/pull/166)
- Bumped mochawesome-report-generator dependency to 2.2.0

### [2.2.1](https://github.com/adamgruber/mochawesome/releases/tag/2.2.1)
- Separated out before and after hooks
- Bumped mochawesome-report-generator dependency to 2.1.0

### [2.2.0](https://github.com/adamgruber/mochawesome/releases/tag/2.2.0)
- Enable using `addContext` in `beforeEach` and `afterEach` test hooks
- Fix a bug where you could pass an object with empty title string to `addContext`
- Allow a context value of `undefined` to be displayed in the report

### [2.1.0](https://github.com/adamgruber/mochawesome/releases/tag/2.1.0)
- Added new options: `overwrite` and `timestamp`

### [2.0.5](https://github.com/adamgruber/mochawesome/releases/tag/2.0.5)
- Fix `UnhandledPromiseRejectionWarning` error when calling nonexistant `exit` function
- Limit files included in package

### [2.0.4](https://github.com/adamgruber/mochawesome/releases/tag/2.0.4)
- Better handling of different coding styles in test code. [#98](https://github.com/adamgruber/mochawesome/issues/98)
- Separate utility functions from main reporter code for better test coverage
- Bump `mochawesome-report-generator` and `fs-extra` packages

### [2.0.3](https://github.com/adamgruber/mochawesome/releases/tag/2.0.3)
- Fixed [#126](https://github.com/adamgruber/mochawesome/issues/126)
- Fix default options handling
- Add `enableCode` option to be consistent with mochawesome-report-generator options
- Deprecate `enableTestCode` option
- Add `dev` option for testing

### [2.0.2](https://github.com/adamgruber/mochawesome/releases/tag/2.0.2)
- Fixed [#111](https://github.com/adamgruber/mochawesome/issues/111)

### [2.0.1](https://github.com/adamgruber/mochawesome/releases/tag/2.0.1)
- Fixed an issue where `reportFilename` was not propagated to `config` object
- Updated handling of `reportDir` option to allow relative paths
- Bumped mochawesome-report-generator dependency (requires 1.0.3 or higher)

## [2.0.0](https://github.com/adamgruber/mochawesome/releases/tag/2.0.0)
- Moved report generation to mochawesome-report package
- Updated dependencies
- Switched from jshint to eslint
- Rewritten using ES6
- Fixed an issue where test uuid was not generated properly
- Added `done` function that will get called before mocha exits (eliminates need for `--no-exit` option)
- Unit tests!
- Added diff for test error
- Added ability to display additional test context

**Breaking Changes**
- `reportName` option changed to `reportFilename`

### [1.5.4](https://github.com/adamgruber/mochawesome/releases/tag/1.5.4)
- Run pending tests thru `cleanTest` function. Fixes possible scenario where a pending test with a large amount of text could cause node to run out of memory. See [#94](https://github.com/adamgruber/mochawesome/issues/94)

### [1.5.3](https://github.com/adamgruber/mochawesome/releases/tag/1.5.3)
- Fixed build issues on Windows. See [#84](https://github.com/adamgruber/mochawesome/pull/84)

### [1.5.2](https://github.com/adamgruber/mochawesome/releases/tag/1.5.2)
- Updated mocha peerDependency to allow any version

### [1.5.1](https://github.com/adamgruber/mochawesome/releases/tag/1.5.1)
- Added missing LICENSE.md file

### [1.5.0](https://github.com/adamgruber/mochawesome/releases/tag/1.5.0)
- Moved mocha to peerDependencies and devDependencies and fixed it to `~2`. See [#69](https://github.com/adamgruber/mochawesome/issues/69)

### [1.4.0](https://github.com/adamgruber/mochawesome/releases/tag/1.4.0)
- Added slide-over navigation menu for quickly jumping to a test suite. See [#49](https://github.com/adamgruber/mochawesome/issues/49)

### [1.3.5](https://github.com/adamgruber/mochawesome/releases/tag/1.3.5)
- Removed extra slash in `@font-path` LESS variable. See [#53](https://github.com/adamgruber/mochawesome/issues/53)

###1.3.4
### [1.3.4](https://github.com/adamgruber/mochawesome/releases/tag/1.3.4)
- Added option to auto open report. Also fixed an issue with boolean options. See [#44](https://github.com/adamgruber/mochawesome/issues/44)

###1.3.3
### [1.3.3](https://github.com/adamgruber/mochawesome/releases/tag/1.3.3)
- Added support for creating custom dir where the parent dir(s) may not exist yet. See [#40](https://github.com/adamgruber/mochawesome/issues/40)

###1.3.2
### [1.3.2](https://github.com/adamgruber/mochawesome/releases/tag/1.3.2)
- Removed `allHooks` array since it was not being used and could lead to an issue where node runs out of memory while rendering the template. See [#33](https://github.com/adamgruber/mochawesome/issues/33)

###1.3.1
### [1.3.1](https://github.com/adamgruber/mochawesome/releases/tag/1.3.1)
- Update copyright in template

###1.3.0
### [1.3.0](https://github.com/adamgruber/mochawesome/releases/tag/1.3.0)
- Changes to support mocha 2.4.0 and later (fixes empty code blocks). See [#29](https://github.com/adamgruber/mochawesome/issues/29)

###1.2.2
### [1.2.2](https://github.com/adamgruber/mochawesome/releases/tag/1.2.2)
- Added option to generate report with all assets inlined. See [#26](https://github.com/adamgruber/mochawesome/issues/26)

###1.2.1
### [1.2.1](https://github.com/adamgruber/mochawesome/releases/tag/1.2.1)
- Reset `totalTestsRegistered` when reporter is run. [PR #21](https://github.com/adamgruber/mochawesome/pull/21)

###1.2.0
### [1.2.0](https://github.com/adamgruber/mochawesome/releases/tag/1.2.0)
- Enhancement: custom report title option. Closes [#11](https://github.com/adamgruber/mochawesome/issues/11)
- Fixed indentation in code block and stack traces

###1.1.2
### [1.1.2](https://github.com/adamgruber/mochawesome/releases/tag/1.1.2)
- Fixes [#10](https://github.com/adamgruber/mochawesome/issues/10)

###1.1.1
### [1.1.1](https://github.com/adamgruber/mochawesome/releases/tag/1.1.0)
- Add filter icon in summary for better visibility (Completely new idea and not at all in response to [this](https://github.com/adamgruber/mochawesome/issues/5))
- Change util.print to console.log due to [deprecation](https://github.com/joyent/node/blob/master/doc/api/util.markdown#user-content-utilprint)

###1.1.0
### [1.1.0](https://github.com/adamgruber/mochawesome/releases/tag/1.1.0)
- Add support for options
- custom report directory
- custom report filename
- Enhancements to console output

###1.0.1 - 1.0.5
### 1.0.1 - 1.0.5
- Bugfixes


###1.0.0
## [1.0.0](https://github.com/adamgruber/mochawesome/releases/tag/1.0.0)
- Redesigned report
- Mobile friendly
- Complete refactor of client-side script
- Custom builds of vendor scripts
- Custom font-icon set
- All fonts are now local to the report
- All fonts are now local to the report
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.