Skip to content

Commit

Permalink
fix tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Kelly Selden committed Jul 9, 2016
1 parent c3e2959 commit 1a51e63
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 17 deletions.
17 changes: 7 additions & 10 deletions app/services/limiter.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import config from '../config/environment';
const {
Service,
RSVP: { Promise },
get,
get, set,
computed: { readOnly },
inject: { service },
run,
Expand All @@ -15,17 +15,18 @@ const {
const { RateLimiter } = nodeRateLimiter;
const isTestEnvironment = config.environment === 'test';

let limiter;

export default Service.extend({
config: service(),

limiterTime: readOnly('config.limiterTime'),
_limiterTime: readOnly('config.limiterTime'),

removeTokens: task(function * (count) {
return yield new Promise(resolve => {
let limiter = get(this, '_limiter');
if (!limiter) {
limiter = new RateLimiter(1, get(this, 'limiterTime'));
limiter = new RateLimiter(1, get(this, '_limiterTime'));

set(this, '_limiter', limiter);
}

// we need a run loop open during testing for the wait helper to work
Expand All @@ -50,9 +51,5 @@ export default Service.extend({
run(resolve);
});
});
}),

reset() {
limiter = null;
}
})
});
7 changes: 0 additions & 7 deletions tests/integration/services/request-cache-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ const CustomAjaxService = AjaxService.extend({
});

let server;
let limiter;
let service;

let responseHeaders;
Expand All @@ -41,11 +40,6 @@ moduleFor('service:request-cache', 'Integration | Service | request cache', {
this.register('service:config', ConfigService);
this.inject.service('config', { as: 'config' });

// https://github.com/jquery/qunit/pull/919
if (!limiter) {
limiter = this.container.lookup('service:limiter');
}

service = this.subject();

responseHeaders = {
Expand All @@ -67,7 +61,6 @@ moduleFor('service:request-cache', 'Integration | Service | request cache', {
},
afterEach() {
server.shutdown();
limiter.reset();
cache.clear();
}
});
Expand Down

0 comments on commit 1a51e63

Please sign in to comment.