Skip to content

Commit

Permalink
Merge pull request #105 from xAPI-vle/v1.5.0
Browse files Browse the repository at this point in the history
V1.5.0
  • Loading branch information
davidpesce authored Jun 8, 2017
2 parents 10a18dd + f7f4d70 commit 0ced99e
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 26 deletions.
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
"require": {
"php": "~5.5 || ^7.0.3",
"rusticisoftware/tincan": "1.0.0",
"learninglocker/moodle-log-expander": "~1.4",
"learninglocker/moodle-xapi-translator": "~1.4",
"learninglocker/xapi-recipe-emitter": "~1.4"
"learninglocker/moodle-log-expander": "~1.5",
"learninglocker/moodle-xapi-translator": "~1.7",
"learninglocker/xapi-recipe-emitter": "~1.6"
},
"prefer-stable": true,
"minimum-stability": "dev"
Expand Down
42 changes: 21 additions & 21 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 8 additions & 2 deletions tests/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ abstract class TestCase extends PhpUnitTestCase {
public function setup() {
$this->cfg = (object) [
'wwwroot' => 'http://www.example.com',
'release' => '1.0.0',
'release' => '1.0.0'
];
$this->xapi_controller = new xapi_controller(new xapi_repository(new xapi_remote_lrs('', '1.0.1', '', '')));
$this->moodle_controller = new moodle_controller(new moodle_repository((object) [], $this->cfg));
Expand All @@ -32,6 +32,12 @@ public function testCreateEvent() {
$moodle_events = $this->moodle_controller->createEvents([$input]);
$this->assertNotNull($moodle_events, 'Check that the events exist in the expander controller.');

//Hack to add Moodle plugin config setting for sendmbox - need to make config function
$moodle_events = [array_merge(
$moodle_events[0],
['sendmbox' => false]
)];

$translator_events = $this->translator_controller->createEvents($moodle_events);
$this->assertNotNull($translator_events, 'Check that the events exist in the translator controller.');

Expand Down Expand Up @@ -61,7 +67,7 @@ protected function constructInput() {
'relateduserid' => '1',
'courseid' => '1',
'timecreated' => 1433946701,
'eventname' => '\core\event\course_viewed',
'eventname' => '\core\event\course_viewed'
];
}
}
Binary file modified xapi.zip
Binary file not shown.

0 comments on commit 0ced99e

Please sign in to comment.