Merge pull request #1035 from bertdeblock/remove-custom-find-by-name-…

…util

Remove custom `findByName` util

lib/commands/try-one.js

@@ -1,6 +1,5 @@
 'use strict';
 
-const findByName = require('../utils/find-by-name');
 const debug = require('debug')('ember-try:commands:try-one');
 
 module.exports = {
@@ -50,7 +49,7 @@ module.exports = {
 
     debug('Config: %s', JSON.stringify(config));
 
-    let scenario = findByName(config.scenarios, scenarioName);
+    let scenario = config.scenarios.find((s) => s.name === scenarioName);
     if (!scenario) {
       throw new Error(
         'The `ember try:one` command requires a scenario ' + 'specified in the config.',

lib/utils/config.js

@@ -3,7 +3,6 @@
 const path = require('path');
 const fs = require('fs');
 const { prefix, warn } = require('./console');
-const findByName = require('./find-by-name');
 const debug = require('debug')('ember-try:utils:config');
 
 function getConfigPath(project) {
@@ -91,12 +90,12 @@ function mergeAutoConfigAndConfigFileData(autoConfig, configData) {
   let conf = Object.assign({}, autoConfig, configData);
 
   let overriddenScenarios = autoConfig.scenarios.map((scenario) => {
-    let overriddenScenario = findByName(configData.scenarios, scenario.name);
+    let overriddenScenario = configData.scenarios.find((s) => s.name === scenario.name);
     return Object.assign({}, scenario, overriddenScenario);
   });
 
   let additionalScenarios = configData.scenarios.filter((scenario) => {
-    return !findByName(autoConfig.scenarios, scenario.name);
+    return !autoConfig.scenarios.find((s) => s.name === scenario.name);
   });
 
   conf.scenarios = [...overriddenScenarios, ...additionalScenarios];