-
Notifications
You must be signed in to change notification settings - Fork 605
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2315 from BobrImperator/2302-use-di-part-2
[2302] put internal-session into DI system
- Loading branch information
Showing
11 changed files
with
65 additions
and
130 deletions.
There are no files selected for viewing
5 changes: 0 additions & 5 deletions
5
packages/ember-simple-auth/addon/initializers/setup-session-service.js
This file was deleted.
Oops, something went wrong.
7 changes: 1 addition & 6 deletions
7
packages/ember-simple-auth/addon/initializers/setup-session.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,11 @@ | ||
import Ember from 'ember'; | ||
import InternalSession from '../internal-session'; | ||
import Ephemeral from '../session-stores/ephemeral'; | ||
import inject from '../utils/inject'; | ||
|
||
export default function setupSession(registry) { | ||
registry.register('session:main', InternalSession); | ||
|
||
let store = 'session-store:application'; | ||
if (Ember.testing) { | ||
store = 'session-store:test'; | ||
registry.register(store, Ephemeral); | ||
registry.register('session-store:test', Ephemeral); | ||
} | ||
|
||
inject(registry, 'session:main', 'store', store); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 3 additions & 9 deletions
12
packages/ember-simple-auth/tests/unit/initializers/setup-session-service-test.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,27 +1,21 @@ | ||
import { describe, beforeEach, it } from 'mocha'; | ||
import { expect } from 'chai'; | ||
import sinonjs from 'sinon'; | ||
import setupSessionService from 'ember-simple-auth/initializers/setup-session-service'; | ||
import { setupTest } from 'ember-mocha'; | ||
|
||
describe('setupSessionService', () => { | ||
setupTest(); | ||
let sinon; | ||
let registry; | ||
|
||
beforeEach(function() { | ||
sinon = sinonjs.createSandbox(); | ||
registry = { | ||
injection() {} | ||
}; | ||
}); | ||
|
||
afterEach(function() { | ||
sinon.restore(); | ||
}); | ||
|
||
it('injects the session into the session service', function() { | ||
sinon.spy(registry, 'injection'); | ||
setupSessionService(registry); | ||
|
||
expect(registry.injection).to.have.been.calledWith('service:session', 'session', 'session:main'); | ||
expect(this.owner.lookup('service:session').session).eq(this.owner.lookup('session:main')); | ||
}); | ||
}); |
70 changes: 0 additions & 70 deletions
70
packages/ember-simple-auth/tests/unit/initializers/setup-session-test.js
This file was deleted.
Oops, something went wrong.
40 changes: 40 additions & 0 deletions
40
packages/ember-simple-auth/tests/unit/internal-session-store-test.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
import Ember from 'ember'; | ||
import { describe, beforeEach, it } from 'mocha'; | ||
import { setupApplicationTest } from 'ember-mocha'; | ||
import { expect } from 'chai'; | ||
import sinonjs from 'sinon'; | ||
|
||
describe('InternalSession store injection', () => { | ||
setupApplicationTest(); | ||
|
||
let sinon; | ||
let session; | ||
|
||
beforeEach(function() { | ||
sinon = sinonjs.createSandbox(); | ||
}); | ||
|
||
afterEach(function() { | ||
sinon.restore(); | ||
}); | ||
|
||
describe('session store injection', function() { | ||
afterEach(function() { | ||
Ember.testing = true; // eslint-disable-line ember/no-ember-testing-in-module-scope | ||
}); | ||
|
||
it('looks up the test session store when Ember.testing true', function() { | ||
Ember.testing = true; // eslint-disable-line ember/no-ember-testing-in-module-scope | ||
|
||
session = this.owner.lookup('session:main'); | ||
expect(session.get('store')).to.eql(this.owner.lookup('session-store:test')); | ||
}); | ||
|
||
it('looks up the application session store when Ember.testing false', function() { | ||
Ember.testing = false; // eslint-disable-line ember/no-ember-testing-in-module-scope | ||
|
||
session = this.owner.lookup('session:main'); | ||
expect(session.get('store')).to.eql(this.owner.lookup('session-store:application')); | ||
}); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters