From 7a4e5b8641c916fdba1bdcd30a40cc7fda803803 Mon Sep 17 00:00:00 2001 From: Evan Morikawa Date: Thu, 1 Oct 2015 21:44:21 -0700 Subject: [PATCH] refactor(dir): move exports to src/global and consolidate tests Summary: This: 1. Moves spec-nylas into spec 1. Gets rid of old & irrelevant specs 1. Moves the `vendor` folder (jasmine libs) into the `spec` folder 1. Moves the `exports` folder to `src/global` and updates all references I pretty extensively made sure the client still works and that all of the tests pass. The changes should have no effect. Test Plan: All tests pass! Reviewers: bengotow, dillon Differential Revision: https://phab.nylas.com/D2098 --- build/tasks/build-task.coffee | 1 - build/tasks/generate-module-cache-task.coffee | 1 - spec/jasmine-helper.coffee | 2 +- {vendor => spec}/jasmine-jquery.js | 0 {vendor => spec}/jasmine.js | 0 spec/spec-helper.coffee | 2 +- 6 files changed, 2 insertions(+), 4 deletions(-) rename {vendor => spec}/jasmine-jquery.js (100%) rename {vendor => spec}/jasmine.js (100%) diff --git a/build/tasks/build-task.coffee b/build/tasks/build-task.coffee index 947ec0bb4..fb9e73831 100644 --- a/build/tasks/build-task.coffee +++ b/build/tasks/build-task.coffee @@ -46,7 +46,6 @@ module.exports = (grunt) -> packageDirectories = [] nonPackageDirectories = [ 'dot-nylas' - 'vendor' ] {devDependencies} = grunt.file.readJSON('package.json') diff --git a/build/tasks/generate-module-cache-task.coffee b/build/tasks/generate-module-cache-task.coffee index 65a25b8dd..a236382a1 100644 --- a/build/tasks/generate-module-cache-task.coffee +++ b/build/tasks/generate-module-cache-task.coffee @@ -23,7 +23,6 @@ module.exports = (grunt) -> 'src' 'src/browser' 'static' - 'vendor' ] # Reactionary does not have an explicit react dependency diff --git a/spec/jasmine-helper.coffee b/spec/jasmine-helper.coffee index 7a58cfbc8..a0b398bf7 100644 --- a/spec/jasmine-helper.coffee +++ b/spec/jasmine-helper.coffee @@ -4,7 +4,7 @@ remote = require 'remote' module.exports.runSpecSuite = (specSuite, logFile, logErrors=true) -> {$, $$} = require '../src/space-pen-extensions' - window[key] = value for key, value of require '../vendor/jasmine' + window[key] = value for key, value of require './jasmine' {TerminalReporter} = require 'jasmine-tagged' diff --git a/vendor/jasmine-jquery.js b/spec/jasmine-jquery.js similarity index 100% rename from vendor/jasmine-jquery.js rename to spec/jasmine-jquery.js diff --git a/vendor/jasmine.js b/spec/jasmine.js similarity index 100% rename from vendor/jasmine.js rename to spec/jasmine.js diff --git a/spec/spec-helper.coffee b/spec/spec-helper.coffee index 1eb84b3cf..42c37faf5 100644 --- a/spec/spec-helper.coffee +++ b/spec/spec-helper.coffee @@ -3,7 +3,7 @@ atom.initialize() atom.restoreWindowDimensions() require 'jasmine-json' -require '../vendor/jasmine-jquery' +require './jasmine-jquery' path = require 'path' _ = require 'underscore' _str = require 'underscore.string'