Skip to content

Fix a failing test #174

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
nachocodoner wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix a failing test #174

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
42 changes: 21 additions & 21 deletions dist/compose.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,27 +49,27 @@ var _utils = require('./utils');
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

function compose(dataLoader) {
var options = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};

return function (Child) {
var _options$errorHandler = options.errorHandler;
var errorHandler = _options$errorHandler === undefined ? function (err) {
var _options$errorHandler = options.errorHandler,
errorHandler = _options$errorHandler === undefined ? function (err) {
throw err;
} : _options$errorHandler;
var _options$loadingHandl = options.loadingHandler;
var loadingHandler = _options$loadingHandl === undefined ? function () {
} : _options$errorHandler,
_options$loadingHandl = options.loadingHandler,
loadingHandler = _options$loadingHandl === undefined ? function () {
return null;
} : _options$loadingHandl;
var _options$env = options.env;
var env = _options$env === undefined ? {} : _options$env;
var _options$pure = options.pure;
var pure = _options$pure === undefined ? false : _options$pure;
var _options$propsToWatch = options.propsToWatch;
var propsToWatch = _options$propsToWatch === undefined ? null : _options$propsToWatch;
var _options$shouldSubscr = options.shouldSubscribe;
var shouldSubscribe = _options$shouldSubscr === undefined ? null : _options$shouldSubscr;
var _options$shouldUpdate = options.shouldUpdate;
var shouldUpdate = _options$shouldUpdate === undefined ? null : _options$shouldUpdate;
} : _options$loadingHandl,
_options$env = options.env,
env = _options$env === undefined ? {} : _options$env,
_options$pure = options.pure,
pure = _options$pure === undefined ? false : _options$pure,
_options$propsToWatch = options.propsToWatch,
propsToWatch = _options$propsToWatch === undefined ? null : _options$propsToWatch,
_options$shouldSubscr = options.shouldSubscribe,
shouldSubscribe = _options$shouldSubscr === undefined ? null : _options$shouldSubscr,
_options$shouldUpdate = options.shouldUpdate,
shouldUpdate = _options$shouldUpdate === undefined ? null : _options$shouldUpdate;

var Container = function (_React$Component) {
(0, _inherits3.default)(Container, _React$Component);
Expand Down Expand Up @@ -147,7 +147,7 @@ function compose(dataLoader) {

var onData = function onData(error, data) {
if (_this2._unmounted) {
throw new Error('Tyring set data after component(' + Container.displayName + ') has unmounted.');
throw new Error('Trying to set data after component(' + Container.displayName + ') has unmounted.');
}

var payload = { error: error, data: data };
Expand Down Expand Up @@ -177,9 +177,9 @@ function compose(dataLoader) {
var _this3 = this;

var props = this.props;
var _state = this.state;
var data = _state.data;
var error = _state.error;
var _state = this.state,
data = _state.data,
error = _state.error;


if (error) {
Expand Down
4 changes: 2 additions & 2 deletions dist/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ var stub = exports.stub = _reactStubber.stub;
var compose = exports.compose = _compose3.default;

function setDefaults() {
var mainOptions = arguments.length <= 0 || arguments[0] === undefined ? {} : arguments[0];
var mainOptions = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};

return function (dataLoader) {
var otherOptions = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
var otherOptions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};

var options = (0, _extends3.default)({}, mainOptions, otherOptions);

Expand Down
2 changes: 1 addition & 1 deletion src/tests/compose.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ describe('compose', () => {
el.instance().componentWillUnmount();

const run = () => onData(null, { aa: 10 });
expect(run).to.throw(/Tyring set data after/);
expect(run).to.throw(/Trying to set data after/);
});
});

Expand Down