Merge branch 'MDL-43743_master' of git://github.com/dmonllao/moodle

diff --git a/mod/scorm/tests/behat/add_scorm.feature b/mod/scorm/tests/behat/add_scorm.feature
index 57cb932..2efa5dc 100644 (file)
--- a/mod/scorm/tests/behat/add_scorm.feature
+++ b/mod/scorm/tests/behat/add_scorm.feature
@@ -24,7 +24,7 @@ Feature: Add scorm activity
     And I fill the moodle form with:
       | Name | Awesome SCORM package |
       | Description | Description |
-    And I upload "mod/scorm/tests/packages/singlescobasic.zip" file to "Package file" filemanager
+    And I upload "mod/scorm/tests/packages/singlesco_scorm12.zip" file to "Package file" filemanager
     And I click on "Save and display" "button"
     Then I should see "Awesome SCORM package"
     And I should see "Normal"
@@ -36,7 +36,6 @@ Feature: Add scorm activity
     And I should see "Normal"
     And I press "Enter"
     And I switch to "scorm_object" iframe
-    And I switch to "contentFrame" iframe
-    And I should see "Play of the game"
+    And I should see "Not implemented yet"
     And I switch to the main frame
     And I follow "Course 1"

diff --git a/mod/scorm/tests/packages/readme_moodle.txt b/mod/scorm/tests/packages/readme_moodle.txt
new file mode 100644 (file)
index 0000000..a2f338d
--- /dev/null
+++ b/mod/scorm/tests/packages/readme_moodle.txt
@@ -0,0 +1,33 @@
+Description of singlesco_scorm12.zip package
+============================================
+
+singlesco_scorm12.zip is a simple Scorm 1.2 package used to run tests related with
+Moodle's scorm features; this package was downloaded from http://scorm.com/ website,
+the website disclaimer states that *Content on this site is licensed under a Creative
+Commons Attribution 3.0 License*.
+
+
+Original source
+===============
+
+http://scorm.com
+
+http://scorm.com/scorm-explained/technical-scorm/golf-examples/
+
+
+Changes
+=======
+
+No changes were made to the original source contents.
+
+
+License
+=======
+
+http://creativecommons.org/licenses/by/3.0/
+
+
+Moodle commit history
+=====================
+
+MDL-43743

diff --git a/mod/scorm/tests/packages/singlesco_scorm12.zip b/mod/scorm/tests/packages/singlesco_scorm12.zip
new file mode 100644 (file)
index 0000000..0735a90
Binary files /dev/null and b/mod/scorm/tests/packages/singlesco_scorm12.zip differ