Skip to content

Commit

Permalink
Manually merge cypress-io/cypress-core-reporter into packages/reporter
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisbreiding committed Apr 21, 2017
1 parent 921b5db commit d06f233
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 23 deletions.
42 changes: 37 additions & 5 deletions packages/reporter/.gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,41 @@
.DS_Store

# Logs
logs
*.log
npm-debug.log*

# Runtime data
pids
*.pid
*.seed

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# node-waf configuration
.lock-wscript

# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release

# Dependency directory
# https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git
node_modules

# Optional npm cache directory
.npm

# Optional REPL history
.node_repl_history

bower_components
*.log
dist*
build
cypress.env.json
tmp
dist

*.orig
13 changes: 0 additions & 13 deletions packages/reporter/lib/reporter.js

This file was deleted.

5 changes: 2 additions & 3 deletions packages/reporter/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@cypress/core-reporter",
"version": "0.3.4",
"main": "lib/reporter",
"main": "src/reporter",
"scripts": {
"build-dev": "node ./scripts/build-dev.js",
"build-prod": "node ./scripts/build-prod.js",
Expand All @@ -23,8 +23,7 @@
},
"homepage": "https://github.com/cypress-io/cypress-core-reporter#readme",
"files": [
"dist",
"lib/reporter.js"
"dist"
],
"devDependencies": {
"@cypress/react-tooltip": "^0.1.1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,5 +76,4 @@ Reporter.defaultProps = {
statsStore,
}

window.Reporter = Reporter
export default Reporter
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { shallow } from 'enzyme'
import React from 'react'
import sinon from 'sinon'

import Reporter from './main'
import Reporter from './reporter'
import Header from './header/header'
import Runnables from './runnables/runnables'

Expand Down

0 comments on commit d06f233

Please sign in to comment.