Skip to content

Update client and ember cli deps, fix tests #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
StevenElberger wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update client and ember cli deps, fix tests #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,9 @@ module.exports = {
},

importBrowserDeps(app) {
if(app.import) {
var vendor = this.treePaths.vendor;
app.import(vendor + '/ldclient-js/dist/ldclient.js', {prepend: true});
//app.import('vendor/shims.js'); //, {prepend: true});
if (app.import) {
var vendor = this.treePaths.vendor;
app.import(vendor + '/launchdarkly-js-client-sdk/dist/ldclient.min.js', {prepend: true});
}
},

Expand All @@ -41,10 +40,10 @@ module.exports = {
trees.push(vendorTree);
}

var ldPath = path.dirname('./node_modules/ldclient-js/dist');
var ldPath = path.dirname('./node_modules/launchdarkly-js-client-sdk/dist');

trees.push(new Funnel(ldPath, {
destDir: 'ldclient-js',
destDir: 'launchdarkly-js-client-sdk',
include: [new RegExp(/\.js$/)]
}));

Expand Down
15 changes: 6 additions & 9 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
"test": "ember try:each"
},
"dependencies": {
"broccoli-funnel": "^1.0.6",
"broccoli-merge-trees": "^1.1.4",
"ember-cli-babel": "^6.6.0",
"ldclient-js": "^1.6.1"
"broccoli-funnel": "^2.0.2",
"broccoli-merge-trees": "^3.0.2",
"ember-cli-babel": "^7.7.3",
"launchdarkly-js-client-sdk": "^2.10.3"
},
"devDependencies": {
"broccoli-asset-rev": "^2.4.5",
"broccoli-asset-rev": "^3.0.0",
"ember-ajax": "^3.0.0",
"ember-cli": "~3.0.2",
"ember-cli": "~3.10.1",
"ember-cli-dependency-checker": "^2.0.0",
"ember-cli-eslint": "^4.2.1",
"ember-cli-htmlbars": "^2.0.1",
Expand All @@ -49,9 +49,6 @@
"eslint-plugin-node": "^5.2.1",
"loader.js": "^4.2.3"
},
"engines": {
"node": "^4.5 || 6.* || >= 7.*"
},
"ember-addon": {
"configPath": "tests/dummy/config"
}
Expand Down
13 changes: 9 additions & 4 deletions tests/unit/initializers/@busy-web/ember-cli-launch-darkly-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ import Application from '@ember/application';
import { initialize } from 'dummy/initializers/@busy-web/ember-cli-launch-darkly';
import { module, test } from 'qunit';
import { setupTest } from 'ember-qunit';
import destroyApp from '../../helpers/destroy-app';
import { run } from '@ember/runloop';
import destroyApp from '../../../helpers/destroy-app';

module('Unit | Initializer | @busy-web/ember-cli-launch-darkly', function(hooks) {
setupTest(hooks);
Expand All @@ -22,10 +23,14 @@ module('Unit | Initializer | @busy-web/ember-cli-launch-darkly', function(hooks)
destroyApp(this.application);
});

// Replace this with your real tests.
test('it works', async function(assert) {
await this.application.boot();
const done = assert.async();

assert.ok(true);
run.next(() => {
this.application.boot();

assert.ok(true);
done();
});
});
});
Loading