t2 init: detectLanguage => resolveLanguage (matches deployment)

Signed-off-by: Rick Waldron <waldron.rick@gmail.com>
tessel · Jun 22, 2016 · d700d68 · d700d68
1 parent 94ba7b6
commit d700d68
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 17 deletions.
diff --git a/lib/init/index.js b/lib/init/index.js
@@ -18,7 +18,7 @@ exportables.initProject = (opts) => {
   opts.directory = opts.directory || path.resolve('.');
 
   // Detect the requested language
-  var lang = exportables.detectLanguage(opts);
+  var lang = exportables.resolveLanguage(opts);
 
   // If a language could not be detected
   if (lang === null) {
@@ -31,7 +31,7 @@ exportables.initProject = (opts) => {
 };
 
 // Determine the langauge to initialize the project with
-exportables.detectLanguage = (opts) => {
+exportables.resolveLanguage = (opts) => {
 
   // If somehow a language option wasn't provided
   if (!opts.lang) {

diff --git a/test/unit/bin-tessel-2.js b/test/unit/bin-tessel-2.js
@@ -913,7 +913,7 @@ exports['Tessel (init)'] = {
     this.successfulCommand = this.sandbox.stub(cli, 'closeSuccessfulCommand');
     this.failedCommand = this.sandbox.stub(cli, 'closeFailedCommand');
     this.initProject = this.sandbox.spy(controller, 't2Init');
-    this.detectLanguage = this.sandbox.spy(init, 'detectLanguage');
+    this.resolveLanguage = this.sandbox.spy(init, 'resolveLanguage');
     this.generateJavaScriptProject = this.sandbox.stub(init.js, 'generateProject').returns(Promise.resolve());
     this.generateRustProject = this.sandbox.stub(init.rs, 'generateProject').returns(Promise.resolve());
     done();
@@ -933,7 +933,7 @@ exports['Tessel (init)'] = {
       // Ensure it calls our internal init function
       test.equal(this.initProject.callCount, 1);
       // Ensure it checks the language being requested
-      test.equal(this.detectLanguage.callCount, 1);
+      test.equal(this.resolveLanguage.callCount, 1);
       // It should generate a js project
       test.equal(this.generateJavaScriptProject.callCount, 1);
       // It should not generate a Rust project
@@ -953,7 +953,7 @@ exports['Tessel (init)'] = {
       // Ensure it calls our internal init function
       test.equal(this.initProject.callCount, 1);
       // Ensure it checks the language being requested
-      test.equal(this.detectLanguage.callCount, 1);
+      test.equal(this.resolveLanguage.callCount, 1);
       // Ensure it does not attempt to generate a Rust project
       test.equal(this.generateJavaScriptProject.callCount, 0);
       // Ensure it does generate a Rust project

diff --git a/test/unit/init.js b/test/unit/init.js
@@ -8,53 +8,53 @@ exports['init (language args)'] = {
   javascriptArgs: function(test) {
     test.expect(4);
     // No language arg indicates JavaScript by default
-    test.ok(init.detectLanguage({}) === init.js);
+    test.ok(init.resolveLanguage({}) === init.js);
     // Can request JavaScript with explicit name
-    test.ok(init.detectLanguage({
+    test.ok(init.resolveLanguage({
       lang: 'javascript'
     }) === init.js);
     // Can request JavaScript with abbr
-    test.ok(init.detectLanguage({
+    test.ok(init.resolveLanguage({
       lang: 'js'
     }) === init.js);
     // This won't request JavaScript init
-    test.ok(init.detectLanguage({
+    test.ok(init.resolveLanguage({
       lang: 'something else'
     }) !== init.js);
     test.done();
   },
   rustArgs: function(test) {
     test.expect(4);
     // No language arg does not mean Rust
-    test.ok(init.detectLanguage({}) !== init.rs);
+    test.ok(init.resolveLanguage({}) !== init.rs);
     // Can request Rust with explicit name
-    test.ok(init.detectLanguage({
+    test.ok(init.resolveLanguage({
       lang: 'rust'
     }) === init.rs);
     // Can request Rust with abbr
-    test.ok(init.detectLanguage({
+    test.ok(init.resolveLanguage({
       lang: 'rs'
     }) === init.rs);
     // This won't request Rust init
-    test.ok(init.detectLanguage({
+    test.ok(init.resolveLanguage({
       lang: 'whitespace'
     }) !== init.rs);
     test.done();
   },
   pythonArgs: function(test) {
     test.expect(4);
     // No language arg does not mean Rust
-    test.ok(init.detectLanguage({}) !== init.py);
+    test.ok(init.resolveLanguage({}) !== init.py);
     // Can request Rust with explicit name
-    test.ok(init.detectLanguage({
+    test.ok(init.resolveLanguage({
       lang: 'python'
     }) === init.py);
     // Can request Rust with abbr
-    test.ok(init.detectLanguage({
+    test.ok(init.resolveLanguage({
       lang: 'py'
     }) === init.py);
     // This won't request Rust init
-    test.ok(init.detectLanguage({
+    test.ok(init.resolveLanguage({
       lang: 'morse-code'
     }) !== init.py);
     test.done();