feature(opportunity-outside-range-c1-c2) #244

lukedawilson · 2020-10-14T16:55:54Z

No description provided.

...est/features/restrictions/booking-window/implemented/opportunity-outside-range-c1-c2-test.js

nickevansuk · 2020-10-14T19:09:16Z

Also note that the artifact from CI on this branch on the last test run also includes the following error:
Error: FAILURE: $.superEvent.offers[0].validFromBeforeStartDate: Invalid type, expected string containing an ISO 8601 Duration but found string.

For this line:
"validFromBeforeStartDate": "-PT11H25M25S"

Which suggests issues with the .NET logic

...est/features/restrictions/booking-window/implemented/opportunity-outside-range-c1-c2-test.js

lukehesluke · 2020-10-15T10:08:16Z

packages/test-interface-criteria/src/criteria/criteriaUtils.js

@@ -65,7 +65,7 @@ function getRemainingCapacity(opportunity) {
 */
 function mustBeWithinBookingWindow(offer, opportunity) {
  if (!offer || !offer.validFromBeforeStartDate) {
-    return false;
+    return null; // Required for validation step


Sorry, what's this for?

Without it, validation fails, complaining that the string isn't a valid ISO offset. It would also work fine with false, but I wanted to make it explicit that it can't be within or outside the booking window if there is no booking window.

...st-interface-criteria/src/criteria/TestOpportunityBookableOutsideValidFromBeforeStartDate.js

nickevansuk

Just picked up on a couple of things

nickevansuk · 2020-10-16T12:39:52Z

...est/features/restrictions/booking-window/implemented/opportunity-outside-range-c1-c2-test.js

+ *   asynchronous before() block has completed.
+ */
+function itShouldReturnOpportunityOfferPairNotBookableError(stage, responseAccessor) {
+  it('should return OpportunityOfferPairNotBookableError', () => {


Note this should only be checking for errors in non-control items, and no errors in control items. A mirror of this example:

openactive-test-suite/packages/openactive-integration-tests/test/features/core/availability-check/implemented/opportunity-full-test.js

Lines 48 to 77 in 07f80ff

Common.itForOrderItemByControl(orderItemCriteria, state, stage, () => responseAccessor().body,

'should include an OpportunityIsFullError',

(feedOrderItem, responseOrderItem, responseOrderItemErrorTypes) => {

chai.expect(responseOrderItemErrorTypes).to.include('OpportunityIsFullError');

if (responseOrderItem.orderedItem['@type'] === 'Slot') {

chai.expect(responseOrderItem).to.nested.include({

'orderedItem.remainingUses': 0,

});

} else {

chai.expect(responseOrderItem).to.nested.include({

'orderedItem.remainingAttendeeCapacity': 0,

});

}

},

'should not include an OpportunityIsFullError',

(feedOrderItem, responseOrderItem, responseOrderItemErrorTypes) => {

chai.expect(responseOrderItemErrorTypes).not.to.include('OpportunityIsFullError');

if (responseOrderItem.orderedItem['@type'] === 'Slot') {

chai.expect(responseOrderItem).to.nested.include({

'orderedItem.remainingUses': feedOrderItem.orderedItem.remainingUses,

});

} else {

chai.expect(responseOrderItem).to.nested.include({

'orderedItem.remainingAttendeeCapacity': feedOrderItem.orderedItem.remainingAttendeeCapacity,

});

}

});

};

nickevansuk · 2020-10-16T12:43:02Z

packages/test-interface-criteria/src/criteria/internal/InternalTestOpportunityBookable.js

  return (Array.isArray(offer.availableChannel) && offer.availableChannel.includes('https://openactive.io/OpenBookingPrepayment'))
    && offer.advanceBooking !== 'https://openactive.io/Unavailable'
-    && (!offer.validFromBeforeStartDate || moment(opportunity.startDate).subtract(moment.duration(offer.validFromBeforeStartDate)).isBefore(options.harvestStartTime));
+    && (!offer.validFromBeforeStartDate || moment(opportunity.startDate).subtract(moment.duration(offer.validFromBeforeStartDate)).isBefore());


This line seems to be revertiing the options.harvestStartTime change

Merge screw-up

lukedawilson self-assigned this Oct 14, 2020

lukedawilson linked an issue Oct 14, 2020 that may be closed by this pull request

booking-window - opportunity-in-range-c1-c2 - checkout when outside booking window #245

Closed

nickevansuk reviewed Oct 14, 2020

View reviewed changes

...est/features/restrictions/booking-window/implemented/opportunity-outside-range-c1-c2-test.js Outdated Show resolved Hide resolved

lukedawilson force-pushed the coverage/opportunity-outside-range-c1-c2 branch from f7c9275 to 67a0469 Compare October 14, 2020 18:43

lukedawilson requested a review from nickevansuk October 14, 2020 18:56

lukehesluke requested changes Oct 15, 2020

View reviewed changes

lukedawilson force-pushed the coverage/opportunity-outside-range-c1-c2 branch 2 times, most recently from 404edf5 to 7332a44 Compare October 15, 2020 11:36

lukedawilson requested a review from lukehesluke October 15, 2020 16:18

lukehesluke approved these changes Oct 15, 2020

View reviewed changes

nickevansuk requested changes Oct 16, 2020

View reviewed changes

lukedawilson force-pushed the coverage/opportunity-outside-range-c1-c2 branch from 57b9e23 to 2009a79 Compare October 16, 2020 15:08

lukedawilson requested a review from nickevansuk October 16, 2020 15:15

Luke Wilson added 5 commits October 21, 2020 10:44

feature(opportunity-outside-range-c1-c2)

69b4951

Review and merge fixes

4b711e9

More review fixes

607ea75

Review fixes

04a40f4

Add explanatory comments

1717a79

lukedawilson force-pushed the coverage/opportunity-outside-range-c1-c2 branch from 66f0b00 to 1717a79 Compare October 21, 2020 09:44

nickevansuk approved these changes Oct 21, 2020

View reviewed changes

lukedawilson merged commit d839f6b into master Oct 21, 2020

lukedawilson deleted the coverage/opportunity-outside-range-c1-c2 branch October 21, 2020 13:22

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feature(opportunity-outside-range-c1-c2) #244

feature(opportunity-outside-range-c1-c2) #244

lukedawilson commented Oct 14, 2020

nickevansuk commented Oct 14, 2020

lukehesluke Oct 15, 2020

lukedawilson Oct 15, 2020

nickevansuk left a comment

nickevansuk Oct 16, 2020

nickevansuk Oct 16, 2020

lukedawilson Oct 16, 2020

	Common.itForOrderItemByControl(orderItemCriteria, state, stage, () => responseAccessor().body,
	'should include an OpportunityIsFullError',
	(feedOrderItem, responseOrderItem, responseOrderItemErrorTypes) => {
	chai.expect(responseOrderItemErrorTypes).to.include('OpportunityIsFullError');

	if (responseOrderItem.orderedItem['@type'] === 'Slot') {
	chai.expect(responseOrderItem).to.nested.include({
	'orderedItem.remainingUses': 0,
	});
	} else {
	chai.expect(responseOrderItem).to.nested.include({
	'orderedItem.remainingAttendeeCapacity': 0,
	});
	}
	},
	'should not include an OpportunityIsFullError',
	(feedOrderItem, responseOrderItem, responseOrderItemErrorTypes) => {
	chai.expect(responseOrderItemErrorTypes).not.to.include('OpportunityIsFullError');

	if (responseOrderItem.orderedItem['@type'] === 'Slot') {
	chai.expect(responseOrderItem).to.nested.include({
	'orderedItem.remainingUses': feedOrderItem.orderedItem.remainingUses,
	});
	} else {
	chai.expect(responseOrderItem).to.nested.include({
	'orderedItem.remainingAttendeeCapacity': feedOrderItem.orderedItem.remainingAttendeeCapacity,
	});
	}
	});
	};

feature(opportunity-outside-range-c1-c2) #244

feature(opportunity-outside-range-c1-c2) #244

Conversation

lukedawilson commented Oct 14, 2020

nickevansuk commented Oct 14, 2020

lukehesluke Oct 15, 2020

Choose a reason for hiding this comment

lukedawilson Oct 15, 2020

Choose a reason for hiding this comment

nickevansuk left a comment

Choose a reason for hiding this comment

nickevansuk Oct 16, 2020

Choose a reason for hiding this comment

nickevansuk Oct 16, 2020

Choose a reason for hiding this comment

lukedawilson Oct 16, 2020

Choose a reason for hiding this comment