diff options
| author | Igor Minar | 2012-08-30 01:10:28 -0700 | 
|---|---|---|
| committer | Igor Minar | 2012-09-13 16:23:18 -0700 | 
| commit | 9d168f058f9c6d7eeae0daa7cb72ea4e02a0003a (patch) | |
| tree | 0addcfc0a1d59f54c646ff2c7dd68fd01428cedf /angularFiles.js | |
| parent | 5418564f0462a7f9b9458b170271a9a267dc4f79 (diff) | |
| download | angular.js-9d168f058f9c6d7eeae0daa7cb72ea4e02a0003a.tar.bz2 | |
chore(testing): Testacular config files + rake tasks
- adds testacular config files for jqlite, jquery, modules and e2e tests
- replaces obsolete JsTD Rake tasks with Testacular onces
- rake tasks are parameterazied so that they can be used locally as well as on CI server
usage:
rake test  # run all tests on Chrome
rake test[Safari+Chrome+Opera]  # run all tests on Safari, Chrome and Opera
rake test[Safari]  # run all tests on Safari
rake test:jqlite # run unit tests using jqlite on Chrome
rake test:jqlite[Safari,"--reporter=dots"]  # run jqlite-based unit tests on Safari with dots reporter
rake autotest:jquery  # start testacular with jquery-based config and watch fs for changes
rake test:e2e # run end to end tests
Diffstat (limited to 'angularFiles.js')
| -rw-r--r-- | angularFiles.js | 54 | 
1 files changed, 24 insertions, 30 deletions
| diff --git a/angularFiles.js b/angularFiles.js index 70502b04..02bdf3a1 100644 --- a/angularFiles.js +++ b/angularFiles.js @@ -196,36 +196,30 @@ angularFiles = {    ]  }; -// Execute only in slim-jim -if (typeof JASMINE_ADAPTER !== 'undefined') { -  // Testacular config -  var mergedFiles = []; -  angularFiles.jstd.forEach(function(file) { -    // replace @ref -    var match = file.match(/^\@(.*)/); -    if (match) { -      var deps = angularFiles[match[1]]; -      if (!deps) { -        console.log('No dependency:' + file) +if (exports) { +  exports.files = angularFiles +  exports.mergeFiles = function mergeFiles() { +    var files = []; + +    [].splice.call(arguments, 0).forEach(function(file) { +      if (file.match(/testacular/)) { +        files.push(file); +      } else { +        angularFiles[file].forEach(function(f) { +          // replace @ref +          var match = f.match(/^\@(.*)/); +          if (match) { +            var deps = angularFiles[match[1]]; +            files = files.concat(deps); +          } else { +            if (!/jstd|jasmine/.test(f)) { //TODO(i): remove once we don't have jstd/jasmine in repo +              files.push(f); +            } +          } +        });        } -      mergedFiles = mergedFiles.concat(deps); -    } else { -      mergedFiles.push(file); -    } -  }); +    }); -  files = [JASMINE, JASMINE_ADAPTER]; - -  mergedFiles.forEach(function(file){ -    if (/jstd|jasmine/.test(file)) return; -    files.push(file); -  }); - - -  exclude = angularFiles.jstdExclude; - -  autoWatch = true; -  autoWatchInterval = 1; -  logLevel = LOG_INFO; -  logColors = true; +    return files; +  }  } | 
