Skip to content

Commit

Permalink
Ensured trackRequests was set properly. Fixed the assert about not ch…
Browse files Browse the repository at this point in the history
…anging tracked requests after pretender is created
  • Loading branch information
cah-brian-gantzler committed Jun 1, 2022
1 parent c15a147 commit 4699b18
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 16 deletions.
11 changes: 7 additions & 4 deletions lib/mock-server/pretender-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,11 @@ export default class PretenderConfig {

mirageServer;

trackRequests;

create(mirageServer, config) {
this.mirageServer = mirageServer;
this.pretender = this._create(mirageServer);
this.pretender = this._create(mirageServer, config);

/**
Mirage uses [pretender.js](https://github.com/trek/pretender) as its xhttp interceptor. In your Mirage config, `this.pretender` refers to the actual Pretender instance, so any config options that work there will work here as well.
Expand Down Expand Up @@ -129,7 +131,7 @@ export default class PretenderConfig {
}

let didOverridePretenderConfig =
config.trackRequests !== undefined && this.pretender;
config.trackRequests !== undefined && config.trackRequests !== this.trackRequests;
assert(
!didOverridePretenderConfig,
"You cannot modify Pretender's request tracking once the server is created"
Expand Down Expand Up @@ -233,8 +235,9 @@ export default class PretenderConfig {
* @return {Object} A new Pretender instance.
* @public
*/
_create(mirageServer) {
_create(mirageServer, config) {
if (typeof window !== "undefined") {
this.trackRequests = config.trackRequests || false;
return new Pretender(
function () {
this.passthroughRequest = function (verb, path, request) {
Expand Down Expand Up @@ -316,7 +319,7 @@ export default class PretenderConfig {
);
};
},
{ trackRequests: mirageServer.shouldTrackRequests() }
{ trackRequests: this.trackRequests }
);
}
}
Expand Down
12 changes: 0 additions & 12 deletions lib/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -386,18 +386,6 @@ export default class Server {
return typeof this.logging !== "undefined" ? this.logging : !this.isTest();
}

/**
* Determines if the server should track requests.
*
* @method shouldTrackRequests
* @return The value of this.trackRequests if defined, false otherwise.
* @public
* @hide
*/
shouldTrackRequests() {
return Boolean(this.trackRequests);
}

/**
* Load the configuration given, setting timing to 0 if in the test
* environment.
Expand Down

0 comments on commit 4699b18

Please sign in to comment.