Repository: ember-cli/ember-cli
Pull request #7056 (2017-05-20 04:49:24)

fix_typos
This PR is part of a campaign to fix a lot of typos on github!
You can see the progress on https://github.com/fixTypos/fix_typos/

https://github.com/client9/misspell


Patch:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6024be39b..4e647e878 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2086,7 +2086,7 @@ version:
 - [#4849](https://github.com/ember-cli/ember-cli/pull/4849) cleanup whitespace in the commands [@kellyselden](https://github.com/kellyselden)
 - [#4857](https://github.com/ember-cli/ember-cli/pull/4857) Only exclude node_modules at root [@joliss](https://github.com/joliss)
 - [#4881](https://github.com/ember-cli/ember-cli/pull/4881) add unit tests for blueprint help printing [@kellyselden](https://github.com/kellyselden)
-- [#4913](https://github.com/ember-cli/ember-cli/pull/4913) adding addtional help tests [@kellyselden](https://github.com/kellyselden)
+- [#4913](https://github.com/ember-cli/ember-cli/pull/4913) adding additional help tests [@kellyselden](https://github.com/kellyselden)
 - [#4946](https://github.com/ember-cli/ember-cli/pull/4946) Fix beforeEach/afterEach callbacks with moduleForAcceptance. [@rwjblue](https://github.com/rwjblue)
 - [#4954](https://github.com/ember-cli/ember-cli/pull/4954) Add smoke test for `moduleForAcceptance` [@seanpdoyle](https://github.com/seanpdoyle)
 - [#4970](https://github.com/ember-cli/ember-cli/pull/4970) Upgrade testem to 0.9.8 [@rzurad](https://github.com/rzurad)
@@ -2582,7 +2582,7 @@ version:
 - [#4027](https://github.com/ember-cli/ember-cli/pull/4027) Re-order postBuild hook [@chadhietala](https://github.com/chadhietala)
 - [#4008](https://github.com/ember-cli/ember-cli/pull/4008) Disable leek for `ember -v` [@twokul](https://github.com/twokul)
 - [#4020](https://github.com/ember-cli/ember-cli/pull/4020) Allowed failures [@stefanpenner](https://github.com/stefanpenner)
-- [#4007](https://github.com/ember-cli/ember-cli/pull/4007) Hide Python on appveyor so npm won't build native extentions [@raytiley](https://github.com/raytiley)
+- [#4007](https://github.com/ember-cli/ember-cli/pull/4007) Hide Python on appveyor so npm won't build native extensions [@raytiley](https://github.com/raytiley)
 - [#4022](https://github.com/ember-cli/ember-cli/pull/4022) Run all tests again [@marcioj](https://github.com/marcioj)
 - [#4032](https://github.com/ember-cli/ember-cli/pull/4032) Update ember-cli-qunit to v0.3.2 [@HeroicEric](https://github.com/HeroicEric)
 - [#4037](https://github.com/ember-cli/ember-cli/pull/4037) Add ember-disable-proxy-controllers to app blueprint [@cibernox](https://github.com/cibernox)
@@ -3056,7 +3056,7 @@ The following changes are required if you are upgrading from the previous versio
 - [#3130](https://github.com/ember-cli/ember-cli/pull/3130) [ENHANCEMENT] Tomster looks fabulous without breaking `ember new`[@johnnyshields](https://github.com/johnnyshields)
 - [#3132](https://github.com/ember-cli/ember-cli/pull/3132) [BUGFIX] Update ember-cli-qunit to v0.3.1. Fixes `tests/.jshintrc` being used instead of app `.jshintrc`. [@rwjblue](https://github.com/rwjblue)
 - [#3133](https://github.com/ember-cli/ember-cli/pull/3133) [BUGFIX] Fix analytics being disabled by default. Users can opt out of anylytics with `--disable-analytics` [@stefanpenner](https://github.com/stefanpenner)
-- [#3153](https://github.com/ember-cli/ember-cli/pull/3153) [ENHANCEMENT]  Remove deafult css from `app/styles/app.css` [@mattjmorrison](https://github.com/mattjmorrison)
+- [#3153](https://github.com/ember-cli/ember-cli/pull/3153) [ENHANCEMENT]  Remove default css from `app/styles/app.css` [@mattjmorrison](https://github.com/mattjmorrison)
 - [#3132](https://github.com/ember-cli/ember-cli/pull/3157) [BUGFIX] Ensure `ember test --environment=production` runs JSHint. [@rwjblue](https://github.com/rwjblue)
 
 Thank you to all who took the time to contribute!
@@ -3293,7 +3293,7 @@ Thank you to all who took the time to contribute!
 - [#2668](https://github.com/ember-cli/ember-cli/pull/2668) added the
   `prepend` flag to `app.import` in `Brocfile.js`, allowing to prepend
   a file to the vendor bundle rather than appended which is the
-  default behaviour.
+  default behavior.
 
    ```
    // Brocfile.js
@@ -3781,7 +3781,7 @@ in the output path. [#1930](https://github.com/stefanpenner/ember-cli/pull/1930)
 * [ENHANCEMENT] Remove `.bowerrc` file from application blueprint (will still use directory specified in `.bowerrc`, but uses the default
   of `bower_components/` if no `.bowerrc` exists). [#1679](https://github.com/stefanpenner/ember-cli/pull/1679)
 * [BUGFIX] Fixes support for `.ember-cli` settings file. [#1676](https://github.com/stefanpenner/ember-cli/pull/1676)
-* [BUGFIX] Blueprint: replace multiple occurences of `__name__` with module name. [#1658](https://github.com/stefanpenner/ember-cli/pull/1658)
+* [BUGFIX] Blueprint: replace multiple occurrences of `__name__` with module name. [#1658](https://github.com/stefanpenner/ember-cli/pull/1658)
 * [ENHANCEMENT] Replace internal live-reload middleware with addon. [#1643](https://github.com/stefanpenner/ember-cli/pull/1643)
 * [ENHANCEMENT] Add .travis.yml to app blueprint. [#1636](https://github.com/stefanpenner/ember-cli/pull/1636)
 * [ENHANCEMENT] Allow individual Blueprints to determine if an entity name is required. [#1631](https://github.com/stefanpenner/ember-cli/pull/1631)
@@ -3879,7 +3879,7 @@ in the output path. [#1930](https://github.com/stefanpenner/ember-cli/pull/1930)
 * [BUGFIX] Update `ember-cli-ic-ajax` to prevent warnings. [#1180](https://github.com/stefanpenner/ember-cli/pull/1180)
 * [BUGFIX] Throw error when trailing slash present in argument to `ember generate`. [#1184](https://github.com/stefanpenner/ember-cli/pull/1184)
 * [ENHANCEMENT] Don't expect `Ember` or `Em` to be global in tests. `Ember` or `Em` needs to be imported. [#1201](https://github.com/stefanpenner/ember-cli/pull/1201)
-* [BUGFIX] Make behaviour of `--dry-run` more obvious & add `--skip-npm` and `--skip-bower`. [#1205](https://github.com/stefanpenner/ember-cli/pull/1205)
+* [BUGFIX] Make behavior of `--dry-run` more obvious & add `--skip-npm` and `--skip-bower`. [#1205](https://github.com/stefanpenner/ember-cli/pull/1205)
 * [ENHANCEMENT] Remove .gitkeep files from `ember init` inside an existing project [#1209](https://github.com/stefanpenner/ember-cli/pull/1209)
 * [ENHANCEMENT] Addons can add commands to the local `ember` command. [#1196](https://github.com/stefanpenner/ember-cli/pull/1196)
 * [ENHANCEMENT] Addons can implement a postBuild hook. [#1215](https://github.com/stefanpenner/ember-cli/pull/1215)
@@ -4016,7 +4016,7 @@ in the output path. [#1930](https://github.com/stefanpenner/ember-cli/pull/1930)
 * [ENHANCEMENT] Update to Broccoli 0.12. Prevents double initial rebuilds when running `ember server`. [#648](https://github.com/stefanpenner/ember-cli/pull/648)
 * [BREAKING ENHANCEMENT] The generated `app.js` and `app.css` files are now named for your application name. [#638](https://github.com/stefanpenner/ember-cli/pull/638)
 * [ENHANCEMENT] added first iteration of a slow but thorough acceptance
-  test. A new app is generated, depedencies resolve, and the test for
+  test. A new app is generated, dependencies resolve, and the test for
   that base app are run.  [#614](https://github.com/stefanpenner/ember-cli/pull/614)
 * [ENHANCEMENT] Use handlebars-runtime in production. [#675](https://github.com/stefanpenner/ember-cli/pull/675)
 * [BUGFIX] Do not watch `vendor/` for changes (watching vendor dramatically increases CPU usage). [#693](https://github.com/stefanpenner/ember-cli/pull/693)
diff --git a/lib/broccoli/ember-app.js b/lib/broccoli/ember-app.js
index 633beac18..106d3b7cc 100644
--- a/lib/broccoli/ember-app.js
+++ b/lib/broccoli/ember-app.js
@@ -283,7 +283,7 @@ class EmberApp {
 
     this.options = defaultsDeep(options, detectedDefaultOptions, DEFAULT_CONFIG);
 
-    // For now we must disable Babel sourcemaps due to unforseen
+    // For now we must disable Babel sourcemaps due to unforeseen
     // performance regressions.
     if (!('sourceMaps' in this.options.babel)) {
       this.options.babel.sourceMaps = false;
diff --git a/lib/models/addon.js b/lib/models/addon.js
index b8454da2f..5ea6468dc 100644
--- a/lib/models/addon.js
+++ b/lib/models/addon.js
@@ -913,7 +913,7 @@ let addonProto = {
     let addonTemplatesRelativeToAddonPath = addonTemplatesTreeInAddonTree && addonTemplatesTreePath.replace(`${addonTreePath}/`, '');
     let podTemplateMatcher = new RegExp(`template\.(${templateExtensions.join('|')})$`);
     let hasPodTemplates = files.some(file => {
-      // short curcuit if this is actually a `addon/templates` file
+      // short circuit if this is actually a `addon/templates` file
       if (addonTemplatesTreeInAddonTree && file.indexOf(addonTemplatesRelativeToAddonPath) === 0) {
         return false;
       }
@@ -1238,7 +1238,7 @@ let addonProto = {
 
     @public
     @method config
-    @param {String} env Name of current environment (ie "developement")
+    @param {String} env Name of current environment (ie "development")
     @param {Object} baseConfig Initial application configuration
     @return {Object} Configuration object to be merged with application configuration.
 
diff --git a/lib/models/addons-factory.js b/lib/models/addons-factory.js
index 4a67cd198..ffbb1d7cb 100644
--- a/lib/models/addons-factory.js
+++ b/lib/models/addons-factory.js
@@ -59,7 +59,7 @@ class AddonsFactory {
         } catch (e) {
           project.ui.writeError(e);
           const SilentError = require('silent-error');
-          throw new SilentError(`An error occured in the constructor for ${addonInfo.name} at ${addonInfo.path}`);
+          throw new SilentError(`An error occurred in the constructor for ${addonInfo.name} at ${addonInfo.path}`);
         }
 
         if (addon.initializeAddons) {
diff --git a/lib/models/blueprint.js b/lib/models/blueprint.js
index 4e51ab2b5..1716852a4 100644
--- a/lib/models/blueprint.js
+++ b/lib/models/blueprint.js
@@ -120,7 +120,7 @@ const writeFile = RSVP.denodeify(fs.outputFile);
 
   ## Index.js
 
-  Custom installation and uninstallation behaviour can be added
+  Custom installation and uninstallation behavior can be added
   by overriding the hooks documented below. `index.js` should
   export a plain object, which will extend the prototype of the
   `Blueprint` class. If needed, the original `Blueprint` prototype
diff --git a/lib/models/command.js b/lib/models/command.js
index 03dc3b848..a5b55fdc0 100644
--- a/lib/models/command.js
+++ b/lib/models/command.js
@@ -603,7 +603,7 @@ let Command = CoreObject.extend({
           --verbose (Default: false)
 
     The default implementation is designed to cover all bases
-    but may be overriden if necessary.
+    but may be overridden if necessary.
 
     @method printBasicHelp
   */
diff --git a/lib/utilities/will-interrupt-process.js b/lib/utilities/will-interrupt-process.js
index 4d7e3efdf..6b96c995f 100644
--- a/lib/utilities/will-interrupt-process.js
+++ b/lib/utilities/will-interrupt-process.js
@@ -101,7 +101,7 @@ function teardownSignalsTrap() {
 }
 
 /**
- * Supresses "Terminate batch job (Y/N)" confirmation on Windows
+ * Suppresses "Terminate batch job (Y/N)" confirmation on Windows
  *
  * @method trapWindowsSignals
  */


Test patch:
diff --git a/tests/unit/cli/cli-test.js b/tests/unit/cli/cli-test.js
index a548f897c..f813dbc03 100644
--- a/tests/unit/cli/cli-test.js
+++ b/tests/unit/cli/cli-test.js
@@ -513,7 +513,7 @@ describe('Unit: CLI', function() {
 
           let options = captor.value;
           expect(options.watch).to.equal(false, 'expected the default watch flag to be false');
-          expect(options.suppressSizes).to.equal(false, 'expected the default supress-sizes flag to be false');
+          expect(options.suppressSizes).to.equal(false, 'expected the default suppress-sizes flag to be false');
         });
       });
 
diff --git a/tests/unit/models/blueprint-test.js b/tests/unit/models/blueprint-test.js
index ecd6bce31..3ea4ff909 100644
--- a/tests/unit/models/blueprint-test.js
+++ b/tests/unit/models/blueprint-test.js
@@ -16,7 +16,7 @@ describe('Blueprint', function() {
   });
 
   describe('.mapFile', function() {
-    it('replaces all occurences of __name__ with module name', function() {
+    it('replaces all occurrences of __name__ with module name', function() {
       let path = Blueprint.prototype.mapFile('__name__/__name__-controller.js', { dasherizedModuleName: 'my-blueprint' });
       expect(path).to.equal('my-blueprint/my-blueprint-controller.js');
 
diff --git a/tests/unit/models/instrumentation-test.js b/tests/unit/models/instrumentation-test.js
index 22aeb96fc..87b59528f 100644
--- a/tests/unit/models/instrumentation-test.js
+++ b/tests/unit/models/instrumentation-test.js
@@ -744,7 +744,7 @@ describe('models/instrumentation.js', function() {
     });
 
     describe('._buildSummary', function() {
-      it('computes inital build sumamries', function() {
+      it('computes initial build sumamries', function() {
         let result = {
           directory: 'tmp/someplace',
           outputChanges: ['assets/foo.js', 'assets/foo.css'],
diff --git a/tests/unit/models/project-test.js b/tests/unit/models/project-test.js
index 31583523a..97df0ab6d 100644
--- a/tests/unit/models/project-test.js
+++ b/tests/unit/models/project-test.js
@@ -397,7 +397,7 @@ describe('models/project.js', function() {
 
       const invalidAddonName = 'ember-invalid-addon';
       const expectedPath = path.join(projectPath, '/lib/', invalidAddonName);
-      const expectedError = `SilentError: An error occured in the constructor for ${invalidAddonName} at ${expectedPath}`;
+      const expectedError = `SilentError: An error occurred in the constructor for ${invalidAddonName} at ${expectedPath}`;
 
       expect(function() {
         project.initializeAddons();