Skip to content

Commit 6537b84

Browse files
committed
Remove channels from menu
1 parent ac116eb commit 6537b84

2 files changed

Lines changed: 2 additions & 101 deletions

File tree

app/services/dependency-resolver.js

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,6 @@ const CDN_MAP = {
3737
}
3838
};
3939

40-
const CHANNEL_FILENAME_MAP = {
41-
'ember': 'ember.debug.js',
42-
'ember-template-compiler': 'ember-template-compiler.js',
43-
'ember-testing': 'ember-testing.js',
44-
'ember-data': 'ember-data.js'
45-
};
46-
47-
const CHANNELS = ['alpha', 'canary', 'beta', 'release'];
48-
4940
const POLL_INTERVAL = 10000;
5041

5142
export default Ember.Service.extend({
@@ -145,19 +136,9 @@ export default Ember.Service.extend({
145136
return this.cdnURL(name, value);
146137
}
147138

148-
if (CHANNELS.indexOf(value) !== -1) {
149-
return this.channelURL(name, value);
150-
}
151-
152139
return value;
153140
},
154141

155-
channelURL(name, channel) {
156-
let fileName = CHANNEL_FILENAME_MAP[name];
157-
158-
return `//s3.amazonaws.com/builds.emberjs.com/${channel}/${fileName}`;
159-
},
160-
161142
cdnURL(name, version) {
162143
let { pakage, library, fileName } = CDN_MAP[name];
163144

@@ -189,10 +170,10 @@ export default Ember.Service.extend({
189170
},
190171

191172
emberVersions: computed(function() {
192-
return [...CHANNELS, ...EMBER_VERSIONS];
173+
return EMBER_VERSIONS;
193174
}),
194175

195176
emberDataVersions: computed(function() {
196-
return [...CHANNELS, ...EMBER_DATA_VERSIONS];
177+
return EMBER_DATA_VERSIONS;
197178
})
198179
});

tests/unit/services/dependency-resolver-test.js

Lines changed: 0 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -97,83 +97,3 @@ test('it resolves version for ember-data', function(assert) {
9797
'ember-data': '//cdnjs.cloudflare.com/ajax/libs/ember-data.js/1.12.1/ember-data.js'
9898
});
9999
});
100-
101-
test('release channel can be specified for version', function(assert) {
102-
var service = this.subject();
103-
104-
var dependencies = {
105-
'ember': 'release',
106-
'ember-template-compiler': 'release',
107-
'ember-testing': 'release',
108-
'ember-data': 'release',
109-
};
110-
111-
service.resolveDependencies(dependencies);
112-
113-
assert.deepEqual(dependencies, {
114-
'ember': '//s3.amazonaws.com/builds.emberjs.com/release/ember.debug.js',
115-
'ember-template-compiler': '//s3.amazonaws.com/builds.emberjs.com/release/ember-template-compiler.js',
116-
'ember-testing': '//s3.amazonaws.com/builds.emberjs.com/release/ember-testing.js',
117-
'ember-data': '//s3.amazonaws.com/builds.emberjs.com/release/ember-data.js'
118-
});
119-
});
120-
121-
test('beta channel can be specified for version', function(assert) {
122-
var service = this.subject();
123-
124-
var dependencies = {
125-
'ember': 'beta',
126-
'ember-template-compiler': 'beta',
127-
'ember-testing': 'beta',
128-
'ember-data': 'beta',
129-
};
130-
131-
service.resolveDependencies(dependencies);
132-
133-
assert.deepEqual(dependencies, {
134-
'ember': '//s3.amazonaws.com/builds.emberjs.com/beta/ember.debug.js',
135-
'ember-template-compiler': '//s3.amazonaws.com/builds.emberjs.com/beta/ember-template-compiler.js',
136-
'ember-testing': '//s3.amazonaws.com/builds.emberjs.com/beta/ember-testing.js',
137-
'ember-data': '//s3.amazonaws.com/builds.emberjs.com/beta/ember-data.js'
138-
});
139-
});
140-
141-
test('canary channel can be specified for version', function(assert) {
142-
var service = this.subject();
143-
144-
var dependencies = {
145-
'ember': 'canary',
146-
'ember-template-compiler': 'canary',
147-
'ember-testing': 'canary',
148-
'ember-data': 'canary',
149-
};
150-
151-
service.resolveDependencies(dependencies);
152-
153-
assert.deepEqual(dependencies, {
154-
'ember': '//s3.amazonaws.com/builds.emberjs.com/canary/ember.debug.js',
155-
'ember-template-compiler': '//s3.amazonaws.com/builds.emberjs.com/canary/ember-template-compiler.js',
156-
'ember-testing': '//s3.amazonaws.com/builds.emberjs.com/canary/ember-testing.js',
157-
'ember-data': '//s3.amazonaws.com/builds.emberjs.com/canary/ember-data.js'
158-
});
159-
});
160-
161-
test('alpha channel can be specified for version', function(assert) {
162-
var service = this.subject();
163-
164-
var dependencies = {
165-
'ember': 'alpha',
166-
'ember-template-compiler': 'alpha',
167-
'ember-testing': 'alpha',
168-
'ember-data': 'alpha',
169-
};
170-
171-
service.resolveDependencies(dependencies);
172-
173-
assert.deepEqual(dependencies, {
174-
'ember': '//s3.amazonaws.com/builds.emberjs.com/alpha/ember.debug.js',
175-
'ember-template-compiler': '//s3.amazonaws.com/builds.emberjs.com/alpha/ember-template-compiler.js',
176-
'ember-testing': '//s3.amazonaws.com/builds.emberjs.com/alpha/ember-testing.js',
177-
'ember-data': '//s3.amazonaws.com/builds.emberjs.com/alpha/ember-data.js'
178-
});
179-
});

0 commit comments

Comments
 (0)