{"action":"created","comment":{"url":"https://api.github.com/repos/ember-cli/ember-cli/pulls/comments/47439334","id":47439334,"diff_hunk":"@@ -1241,23 +1241,32 @@ EmberApp.prototype.testFiles = function(coreTestTree) {\n   testSupportPath = testSupportPath.testSupport || testSupportPath;\n \n   var external = this._processedExternalTree();\n-\n   var emberCLITree = this._processedEmberCLITree();\n \n-  var testJs = this.concatFiles(mergeTrees([external, coreTestTree]), {\n-    inputFiles: this.legacyTestFilesToAppend,\n-    outputFile: testSupportPath,\n-    annotation: 'Concat: Test Support JS'\n+  var addonTestSupportTree = mergeTrees(this.addonTreesFor('addon-test-support'), {\n+    overwrite: true,\n+    annotation: 'TreeMerger (addon-test-support)'\n   });\n+  var transpiledAddonTestSupportTree = new Babel(addonTestSupportTree, this._prunedBabelOptions());\n \n-  testJs = this.concatFiles(mergeTrees([testJs, emberCLITree]), {\n-    inputFiles: [\n-      'vendor/ember-cli/test-support-prefix.js',\n-      testSupportPath.slice(1),\n-      'vendor/ember-cli/test-support-suffix.js'\n-    ],\n+  var finalAddonTestSupportTree = new Funnel(transpiledAddonTestSupportTree, {\n+    allowEmpty: true,\n+    destDir: 'addon-test-support',\n+    annotation: 'Funnel: Addon Test Support'\n+  });\n+\n+  var inputFiles = [].concat(\n+    this.legacyFilesToAppend,","path":"lib/broccoli/ember-app.js","position":30,"original_position":30,"commit_id":"3612c19ec50a07ae93d5b5cf4b117ae32f054222","original_commit_id":"3612c19ec50a07ae93d5b5cf4b117ae32f054222","user":{"login":"stefanpenner","id":1377,"avatar_url":"https://avatars.githubusercontent.com/u/1377?v=3","gravatar_id":"","url":"https://api.github.com/users/stefanpenner","html_url":"https://github.com/stefanpenner","followers_url":"https://api.github.com/users/stefanpenner/followers","following_url":"https://api.github.com/users/stefanpenner/following{/other_user}","gists_url":"https://api.github.com/users/stefanpenner/gists{/gist_id}","starred_url":"https://api.github.com/users/stefanpenner/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/stefanpenner/subscriptions","organizations_url":"https://api.github.com/users/stefanpenner/orgs","repos_url":"https://api.github.com/users/stefanpenner/repos","events_url":"https://api.github.com/users/stefanpenner/events{/privacy}","received_events_url":"https://api.github.com/users/stefanpenner/received_events","type":"User","site_admin":false},"body":"i think this wants to be: `legacyTestFilesToAppend`","created_at":"2015-12-13T02:05:30Z","updated_at":"2015-12-13T02:05:30Z","html_url":"https://github.com/ember-cli/ember-cli/pull/5205#discussion_r47439334","pull_request_url":"https://api.github.com/repos/ember-cli/ember-cli/pulls/5205","_links":{"self":{"href":"https://api.github.com/repos/ember-cli/ember-cli/pulls/comments/47439334"},"html":{"href":"https://github.com/ember-cli/ember-cli/pull/5205#discussion_r47439334"},"pull_request":{"href":"https://api.github.com/repos/ember-cli/ember-cli/pulls/5205"}}},"pull_request":{"url":"https://api.github.com/repos/ember-cli/ember-cli/pulls/5205","id":53490741,"html_url":"https://github.com/ember-cli/ember-cli/pull/5205","diff_url":"https://github.com/ember-cli/ember-cli/pull/5205.diff","patch_url":"https://github.com/ember-cli/ember-cli/pull/5205.patch","issue_url":"https://api.github.com/repos/ember-cli/ember-cli/issues/5205","number":5205,"state":"open","locked":false,"title":"[WIP] Add addon-test-support tree.","user":{"login":"rwjblue","id":12637,"avatar_url":"https://avatars.githubusercontent.com/u/12637?v=3","gravatar_id":"","url":"https://api.github.com/users/rwjblue","html_url":"https://github.com/rwjblue","followers_url":"https://api.github.com/users/rwjblue/followers","following_url":"https://api.github.com/users/rwjblue/following{/other_user}","gists_url":"https://api.github.com/users/rwjblue/gists{/gist_id}","starred_url":"https://api.github.com/users/rwjblue/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/rwjblue/subscriptions","organizations_url":"https://api.github.com/users/rwjblue/orgs","repos_url":"https://api.github.com/users/rwjblue/repos","events_url":"https://api.github.com/users/rwjblue/events{/privacy}","received_events_url":"https://api.github.com/users/rwjblue/received_events","type":"User","site_admin":false},"body":"This commit adds a new tree type to be used during the build processing.  It adds a way for addons to provide testing helpers (in `<addon-name>/test-support` to the consuming app) in the `test-support` file (essentially \"vendor\" for \"tests\").\n\n---\n\n- [ ] Sanity check\n- [ ] Add tests","created_at":"2015-12-13T01:57:49Z","updated_at":"2015-12-13T02:05:30Z","closed_at":null,"merged_at":null,"merge_commit_sha":"a98ab09dd675b741631d1ba3c205520eab2b76c6","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/ember-cli/ember-cli/pulls/5205/commits","review_comments_url":"https://api.github.com/repos/ember-cli/ember-cli/pulls/5205/comments","review_comment_url":"https://api.github.com/repos/ember-cli/ember-cli/pulls/comments{/number}","comments_url":"https://api.github.com/repos/ember-cli/ember-cli/issues/5205/comments","statuses_url":"https://api.github.com/repos/ember-cli/ember-cli/statuses/3612c19ec50a07ae93d5b5cf4b117ae32f054222","head":{"label":"rwjblue:add-addon-test-support-tree","ref":"add-addon-test-support-tree","sha":"3612c19ec50a07ae93d5b5cf4b117ae32f054222","user":{"login":"rwjblue","id":12637,"avatar_url":"https://avatars.githubusercontent.com/u/12637?v=3","gravatar_id":"","url":"https://api.github.com/users/rwjblue","html_url":"https://github.com/rwjblue","followers_url":"https://api.github.com/users/rwjblue/followers","following_url":"https://api.github.com/users/rwjblue/following{/other_user}","gists_url":"https://api.github.com/users/rwjblue/gists{/gist_id}","starred_url":"https://api.github.com/users/rwjblue/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/rwjblue/subscriptions","organizations_url":"https://api.github.com/users/rwjblue/orgs","repos_url":"https://api.github.com/users/rwjblue/repos","events_url":"https://api.github.com/users/rwjblue/events{/privacy}","received_events_url":"https://api.github.com/users/rwjblue/received_events","type":"User","site_admin":false},"repo":{"id":18245773,"name":"ember-cli","full_name":"rwjblue/ember-cli","owner":{"login":"rwjblue","id":12637,"avatar_url":"https://avatars.githubusercontent.com/u/12637?v=3","gravatar_id":"","url":"https://api.github.com/users/rwjblue","html_url":"https://github.com/rwjblue","followers_url":"https://api.github.com/users/rwjblue/followers","following_url":"https://api.github.com/users/rwjblue/following{/other_user}","gists_url":"https://api.github.com/users/rwjblue/gists{/gist_id}","starred_url":"https://api.github.com/users/rwjblue/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/rwjblue/subscriptions","organizations_url":"https://api.github.com/users/rwjblue/orgs","repos_url":"https://api.github.com/users/rwjblue/repos","events_url":"https://api.github.com/users/rwjblue/events{/privacy}","received_events_url":"https://api.github.com/users/rwjblue/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/rwjblue/ember-cli","description":"","fork":true,"url":"https://api.github.com/repos/rwjblue/ember-cli","forks_url":"https://api.github.com/repos/rwjblue/ember-cli/forks","keys_url":"https://api.github.com/repos/rwjblue/ember-cli/keys{/key_id}","collaborators_url":"https://api.github.com/repos/rwjblue/ember-cli/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/rwjblue/ember-cli/teams","hooks_url":"https://api.github.com/repos/rwjblue/ember-cli/hooks","issue_events_url":"https://api.github.com/repos/rwjblue/ember-cli/issues/events{/number}","events_url":"https://api.github.com/repos/rwjblue/ember-cli/events","assignees_url":"https://api.github.com/repos/rwjblue/ember-cli/assignees{/user}","branches_url":"https://api.github.com/repos/rwjblue/ember-cli/branches{/branch}","tags_url":"https://api.github.com/repos/rwjblue/ember-cli/tags","blobs_url":"https://api.github.com/repos/rwjblue/ember-cli/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/rwjblue/ember-cli/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/rwjblue/ember-cli/git/refs{/sha}","trees_url":"https://api.github.com/repos/rwjblue/ember-cli/git/trees{/sha}","statuses_url":"https://api.github.com/repos/rwjblue/ember-cli/statuses/{sha}","languages_url":"https://api.github.com/repos/rwjblue/ember-cli/languages","stargazers_url":"https://api.github.com/repos/rwjblue/ember-cli/stargazers","contributors_url":"https://api.github.com/repos/rwjblue/ember-cli/contributors","subscribers_url":"https://api.github.com/repos/rwjblue/ember-cli/subscribers","subscription_url":"https://api.github.com/repos/rwjblue/ember-cli/subscription","commits_url":"https://api.github.com/repos/rwjblue/ember-cli/commits{/sha}","git_commits_url":"https://api.github.com/repos/rwjblue/ember-cli/git/commits{/sha}","comments_url":"https://api.github.com/repos/rwjblue/ember-cli/comments{/number}","issue_comment_url":"https://api.github.com/repos/rwjblue/ember-cli/issues/comments{/number}","contents_url":"https://api.github.com/repos/rwjblue/ember-cli/contents/{+path}","compare_url":"https://api.github.com/repos/rwjblue/ember-cli/compare/{base}...{head}","merges_url":"https://api.github.com/repos/rwjblue/ember-cli/merges","archive_url":"https://api.github.com/repos/rwjblue/ember-cli/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/rwjblue/ember-cli/downloads","issues_url":"https://api.github.com/repos/rwjblue/ember-cli/issues{/number}","pulls_url":"https://api.github.com/repos/rwjblue/ember-cli/pulls{/number}","milestones_url":"https://api.github.com/repos/rwjblue/ember-cli/milestones{/number}","notifications_url":"https://api.github.com/repos/rwjblue/ember-cli/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/rwjblue/ember-cli/labels{/name}","releases_url":"https://api.github.com/repos/rwjblue/ember-cli/releases{/id}","created_at":"2014-03-29T16:54:32Z","updated_at":"2014-07-18T12:44:07Z","pushed_at":"2015-12-13T01:57:22Z","git_url":"git://github.com/rwjblue/ember-cli.git","ssh_url":"git@github.com:rwjblue/ember-cli.git","clone_url":"https://github.com/rwjblue/ember-cli.git","svn_url":"https://github.com/rwjblue/ember-cli","homepage":null,"size":6876,"stargazers_count":0,"watchers_count":0,"language":"JavaScript","has_issues":false,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"ember-cli:master","ref":"master","sha":"ada39d766533720ca5d78dbf4c9cdda2cee37d15","user":{"login":"ember-cli","id":10262982,"avatar_url":"https://avatars.githubusercontent.com/u/10262982?v=3","gravatar_id":"","url":"https://api.github.com/users/ember-cli","html_url":"https://github.com/ember-cli","followers_url":"https://api.github.com/users/ember-cli/followers","following_url":"https://api.github.com/users/ember-cli/following{/other_user}","gists_url":"https://api.github.com/users/ember-cli/gists{/gist_id}","starred_url":"https://api.github.com/users/ember-cli/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ember-cli/subscriptions","organizations_url":"https://api.github.com/users/ember-cli/orgs","repos_url":"https://api.github.com/users/ember-cli/repos","events_url":"https://api.github.com/users/ember-cli/events{/privacy}","received_events_url":"https://api.github.com/users/ember-cli/received_events","type":"Organization","site_admin":false},"repo":{"id":14089735,"name":"ember-cli","full_name":"ember-cli/ember-cli","owner":{"login":"ember-cli","id":10262982,"avatar_url":"https://avatars.githubusercontent.com/u/10262982?v=3","gravatar_id":"","url":"https://api.github.com/users/ember-cli","html_url":"https://github.com/ember-cli","followers_url":"https://api.github.com/users/ember-cli/followers","following_url":"https://api.github.com/users/ember-cli/following{/other_user}","gists_url":"https://api.github.com/users/ember-cli/gists{/gist_id}","starred_url":"https://api.github.com/users/ember-cli/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/ember-cli/subscriptions","organizations_url":"https://api.github.com/users/ember-cli/orgs","repos_url":"https://api.github.com/users/ember-cli/repos","events_url":"https://api.github.com/users/ember-cli/events{/privacy}","received_events_url":"https://api.github.com/users/ember-cli/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/ember-cli/ember-cli","description":"","fork":false,"url":"https://api.github.com/repos/ember-cli/ember-cli","forks_url":"https://api.github.com/repos/ember-cli/ember-cli/forks","keys_url":"https://api.github.com/repos/ember-cli/ember-cli/keys{/key_id}","collaborators_url":"https://api.github.com/repos/ember-cli/ember-cli/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/ember-cli/ember-cli/teams","hooks_url":"https://api.github.com/repos/ember-cli/ember-cli/hooks","issue_events_url":"https://api.github.com/repos/ember-cli/ember-cli/issues/events{/number}","events_url":"https://api.github.com/repos/ember-cli/ember-cli/events","assignees_url":"https://api.github.com/repos/ember-cli/ember-cli/assignees{/user}","branches_url":"https://api.github.com/repos/ember-cli/ember-cli/branches{/branch}","tags_url":"https://api.github.com/repos/ember-cli/ember-cli/tags","blobs_url":"https://api.github.com/repos/ember-cli/ember-cli/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/ember-cli/ember-cli/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/ember-cli/ember-cli/git/refs{/sha}","trees_url":"https://api.github.com/repos/ember-cli/ember-cli/git/trees{/sha}","statuses_url":"https://api.github.com/repos/ember-cli/ember-cli/statuses/{sha}","languages_url":"https://api.github.com/repos/ember-cli/ember-cli/languages","stargazers_url":"https://api.github.com/repos/ember-cli/ember-cli/stargazers","contributors_url":"https://api.github.com/repos/ember-cli/ember-cli/contributors","subscribers_url":"https://api.github.com/repos/ember-cli/ember-cli/subscribers","subscription_url":"https://api.github.com/repos/ember-cli/ember-cli/subscription","commits_url":"https://api.github.com/repos/ember-cli/ember-cli/commits{/sha}","git_commits_url":"https://api.github.com/repos/ember-cli/ember-cli/git/commits{/sha}","comments_url":"https://api.github.com/repos/ember-cli/ember-cli/comments{/number}","issue_comment_url":"https://api.github.com/repos/ember-cli/ember-cli/issues/comments{/number}","contents_url":"https://api.github.com/repos/ember-cli/ember-cli/contents/{+path}","compare_url":"https://api.github.com/repos/ember-cli/ember-cli/compare/{base}...{head}","merges_url":"https://api.github.com/repos/ember-cli/ember-cli/merges","archive_url":"https://api.github.com/repos/ember-cli/ember-cli/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/ember-cli/ember-cli/downloads","issues_url":"https://api.github.com/repos/ember-cli/ember-cli/issues{/number}","pulls_url":"https://api.github.com/repos/ember-cli/ember-cli/pulls{/number}","milestones_url":"https://api.github.com/repos/ember-cli/ember-cli/milestones{/number}","notifications_url":"https://api.github.com/repos/ember-cli/ember-cli/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/ember-cli/ember-cli/labels{/name}","releases_url":"https://api.github.com/repos/ember-cli/ember-cli/releases{/id}","created_at":"2013-11-03T17:34:43Z","updated_at":"2015-12-12T15:37:38Z","pushed_at":"2015-12-13T01:57:49Z","git_url":"git://github.com/ember-cli/ember-cli.git","ssh_url":"git@github.com:ember-cli/ember-cli.git","clone_url":"https://github.com/ember-cli/ember-cli.git","svn_url":"https://github.com/ember-cli/ember-cli","homepage":"http://ember-cli.com/","size":16684,"stargazers_count":2705,"watchers_count":2705,"language":"JavaScript","has_issues":true,"has_downloads":true,"has_wiki":true,"has_pages":false,"forks_count":776,"mirror_url":null,"open_issues_count":262,"forks":776,"open_issues":262,"watchers":2705,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/ember-cli/ember-cli/pulls/5205"},"html":{"href":"https://github.com/ember-cli/ember-cli/pull/5205"},"issue":{"href":"https://api.github.com/repos/ember-cli/ember-cli/issues/5205"},"comments":{"href":"https://api.github.com/repos/ember-cli/ember-cli/issues/5205/comments"},"review_comments":{"href":"https://api.github.com/repos/ember-cli/ember-cli/pulls/5205/comments"},"review_comment":{"href":"https://api.github.com/repos/ember-cli/ember-cli/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/ember-cli/ember-cli/pulls/5205/commits"},"statuses":{"href":"https://api.github.com/repos/ember-cli/ember-cli/statuses/3612c19ec50a07ae93d5b5cf4b117ae32f054222"}}}}