Skip to content

Commit

Permalink
Remove channels from menu
Browse files Browse the repository at this point in the history
  • Loading branch information
Gaurav0 committed Oct 3, 2018
1 parent ac116eb commit 6537b84
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 101 deletions.
23 changes: 2 additions & 21 deletions app/services/dependency-resolver.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,6 @@ const CDN_MAP = {
}
};

const CHANNEL_FILENAME_MAP = {
'ember': 'ember.debug.js',
'ember-template-compiler': 'ember-template-compiler.js',
'ember-testing': 'ember-testing.js',
'ember-data': 'ember-data.js'
};

const CHANNELS = ['alpha', 'canary', 'beta', 'release'];

const POLL_INTERVAL = 10000;

export default Ember.Service.extend({
Expand Down Expand Up @@ -145,19 +136,9 @@ export default Ember.Service.extend({
return this.cdnURL(name, value);
}

if (CHANNELS.indexOf(value) !== -1) {
return this.channelURL(name, value);
}

return value;
},

channelURL(name, channel) {
let fileName = CHANNEL_FILENAME_MAP[name];

return `//s3.amazonaws.com/builds.emberjs.com/${channel}/${fileName}`;
},

cdnURL(name, version) {
let { pakage, library, fileName } = CDN_MAP[name];

Expand Down Expand Up @@ -189,10 +170,10 @@ export default Ember.Service.extend({
},

emberVersions: computed(function() {
return [...CHANNELS, ...EMBER_VERSIONS];
return EMBER_VERSIONS;
}),

emberDataVersions: computed(function() {
return [...CHANNELS, ...EMBER_DATA_VERSIONS];
return EMBER_DATA_VERSIONS;
})
});
80 changes: 0 additions & 80 deletions tests/unit/services/dependency-resolver-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,83 +97,3 @@ test('it resolves version for ember-data', function(assert) {
'ember-data': '//cdnjs.cloudflare.com/ajax/libs/ember-data.js/1.12.1/ember-data.js'
});
});

test('release channel can be specified for version', function(assert) {
var service = this.subject();

var dependencies = {
'ember': 'release',
'ember-template-compiler': 'release',
'ember-testing': 'release',
'ember-data': 'release',
};

service.resolveDependencies(dependencies);

assert.deepEqual(dependencies, {
'ember': '//s3.amazonaws.com/builds.emberjs.com/release/ember.debug.js',
'ember-template-compiler': '//s3.amazonaws.com/builds.emberjs.com/release/ember-template-compiler.js',
'ember-testing': '//s3.amazonaws.com/builds.emberjs.com/release/ember-testing.js',
'ember-data': '//s3.amazonaws.com/builds.emberjs.com/release/ember-data.js'
});
});

test('beta channel can be specified for version', function(assert) {
var service = this.subject();

var dependencies = {
'ember': 'beta',
'ember-template-compiler': 'beta',
'ember-testing': 'beta',
'ember-data': 'beta',
};

service.resolveDependencies(dependencies);

assert.deepEqual(dependencies, {
'ember': '//s3.amazonaws.com/builds.emberjs.com/beta/ember.debug.js',
'ember-template-compiler': '//s3.amazonaws.com/builds.emberjs.com/beta/ember-template-compiler.js',
'ember-testing': '//s3.amazonaws.com/builds.emberjs.com/beta/ember-testing.js',
'ember-data': '//s3.amazonaws.com/builds.emberjs.com/beta/ember-data.js'
});
});

test('canary channel can be specified for version', function(assert) {
var service = this.subject();

var dependencies = {
'ember': 'canary',
'ember-template-compiler': 'canary',
'ember-testing': 'canary',
'ember-data': 'canary',
};

service.resolveDependencies(dependencies);

assert.deepEqual(dependencies, {
'ember': '//s3.amazonaws.com/builds.emberjs.com/canary/ember.debug.js',
'ember-template-compiler': '//s3.amazonaws.com/builds.emberjs.com/canary/ember-template-compiler.js',
'ember-testing': '//s3.amazonaws.com/builds.emberjs.com/canary/ember-testing.js',
'ember-data': '//s3.amazonaws.com/builds.emberjs.com/canary/ember-data.js'
});
});

test('alpha channel can be specified for version', function(assert) {
var service = this.subject();

var dependencies = {
'ember': 'alpha',
'ember-template-compiler': 'alpha',
'ember-testing': 'alpha',
'ember-data': 'alpha',
};

service.resolveDependencies(dependencies);

assert.deepEqual(dependencies, {
'ember': '//s3.amazonaws.com/builds.emberjs.com/alpha/ember.debug.js',
'ember-template-compiler': '//s3.amazonaws.com/builds.emberjs.com/alpha/ember-template-compiler.js',
'ember-testing': '//s3.amazonaws.com/builds.emberjs.com/alpha/ember-testing.js',
'ember-data': '//s3.amazonaws.com/builds.emberjs.com/alpha/ember-data.js'
});
});

0 comments on commit 6537b84

Please sign in to comment.