Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
- remove `Gemfile.lock` to ensure up-to-date gem versions
- ignore `Gemfile.lock`
- ignore more files in `_config.yml`
- use a bunch of defaults in `_config.yml`
- update `Gemfile` to reflect current instructions from GitHub
- fix a URL and TOC issue(s)
- fix some `package.json` issues
- fix some dumb CSS
  • Loading branch information
boneskull committed Apr 11, 2016
1 parent 9a265bf commit 21df914
Show file tree
Hide file tree
Showing 7 changed files with 22 additions and 153 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
_site
node_modules
npm-debug.log*
Gemfile.lock
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
source 'https://rubygems.org'
gem 'github-pages'
gem 'github-pages', group: :jekyll_plugins
131 changes: 0 additions & 131 deletions Gemfile.lock

This file was deleted.

9 changes: 4 additions & 5 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
url: http://mochajs.org
markdown: kramdown
redcarpet:
extensions: ["with_toc_data"]
highlighter: rouge
url: https://mochajs.org
exclude:
- node_modules
- README.md
- Gemfile*
- package.json
- CNAME
- Makefile
- npm-debug.log*


12 changes: 6 additions & 6 deletions css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -178,12 +178,12 @@ img {
}

.badge > img {
margin: 0px;
padding: 0px;
-webkit-border-radius: 0px;
-moz-border-radius: 0px;
-o-border-radius: 0px;
border-radius: 0px;
margin: 0;
padding: 0;
-webkit-border-radius: 0;
-moz-border-radius: 0;
-o-border-radius: 0;
border-radius: 0;
-webkit-box-shadow: none;
-moz-box-shadow: none;
box-shadow: none;
Expand Down
6 changes: 3 additions & 3 deletions index.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Mocha is a feature-rich JavaScript test framework running on [Node.js](http://no
- [Interfaces](#interfaces)
- [Reporters](#reporters)
- [Running Mocha in the Browser](#running-mocha-in-the-browser)
- [`mocha.opts`](#mocha-opts)
- [`mocha.opts`](#mochaopts)
- [The `test/` Directory](#the-test-directory)
- [Editor Plugins](#editor-plugins)
- [Examples](#examples)
Expand Down Expand Up @@ -188,7 +188,7 @@ describe('#find()', function() {

(The latter example uses [Chai as Promised](https://www.npmjs.com/package/chai-as-promised) for fluent promise assertions.)

## Arrow functions
## Arrow Functions

Passing [arrow functions](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions/Arrow_functions) to Mocha is discouraged. Their lexical binding of the `this` value makes them unable to access the Mocha context, and statements like `this.timeout(1000);` will not work inside an arrow function.

Expand Down Expand Up @@ -663,7 +663,7 @@ suite('Array', function() {

### Exports

The **Exports** interface is much like Mocha's predecessor [expresso](https://github.com/visionmedia/expresso). The keys `before`, `after`, `beforeEach`, and `afterEach` are special-cased, object values are suites, and function values are test-cases:
The **Exports** interface is much like Mocha's predecessor [expresso](https://github.com/tj/expresso). The keys `before`, `after`, `beforeEach`, and `afterEach` are special-cased, object values are suites, and function values are test-cases:

```js
module.exports = {
Expand Down
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,24 @@
"version": "1.0.0",
"description": "Mocha's gh-pages branch",
"private": true,
"maintainers": [
"travisjeffery <tj@travisjeffery.com>",
"jbnicolai <joshua@jbna.nl>",
"boneskull <chiller@badwing.com>"
"authors": [
"David da Silva Contín <dasilvacontin@gmail.com>",
"Christopher Hiller <boneskull@boneskull.com>",
"Travis Jeffery <tj@travisjeffery.com>"
],
"scripts": {
"prepublish": "gem install bundler && bundle install",
"build": "make build"
},
"repository": {
"type": "git",
"url": "https://github.com/mochajs/mocha.git#gh-pages"
"url": "https://github.com/mochajs/mochajs.github.io.git"
},
"license": "MIT",
"bugs": {
"url": "https://github.com/mochajs/mocha/issues"
"url": "https://github.com/mochajs/mochajs.github.io/issues"
},
"homepage": "http://mochajs.org",
"homepage": "https://mochajs.org",
"devDependencies": {
"markdown-toc-index": "^0.2.0"
}
Expand Down

0 comments on commit 21df914

Please sign in to comment.