Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'w13_MDL-26909_20_mediatests' of git://github.com/skodak…

…/moodle into MOODLE_20_STABLE
  • Loading branch information...
commit 1be2b904abb43403b993bd10db6428c3dde0498f 2 parents 337817e + 3c3d544
Eloy Lafuente (stronk7) stronk7 authored

Showing 1 changed file with 10 additions and 19 deletions. Show diff stats Hide diff stats

  1. +10 19 filter/mediaplugin/simpletest/testfiltermediaplugin.php
29 filter/mediaplugin/simpletest/testfiltermediaplugin.php
@@ -38,20 +38,16 @@ function test_filter_mediaplugin_link() {
38 38
39 39 // we need to enable the plugins somehow
40 40 $oldcfg = clone($CFG); // very, very ugly hack
41   - $CFG->filter_mediaplugin_enable_mp3 = 1;
42   - $CFG->filter_mediaplugin_enable_ogg = 1;
43   - $CFG->filter_mediaplugin_enable_ogv = 1;
44   - $CFG->filter_mediaplugin_enable_swf = 1;
45   - $CFG->filter_mediaplugin_enable_flv = 1;
46   - $CFG->filter_mediaplugin_enable_mov = 1;
47   - $CFG->filter_mediaplugin_enable_wmv = 1;
48   - $CFG->filter_mediaplugin_enable_mpg = 1;
49   - $CFG->filter_mediaplugin_enable_avi = 1;
50   - $CFG->filter_mediaplugin_enable_ram = 1;
51   - $CFG->filter_mediaplugin_enable_rpm = 1;
52   - $CFG->filter_mediaplugin_enable_rm = 1;
53   - $CFG->filter_mediaplugin_enable_youtube = 1;
54   - $CFG->filter_mediaplugin_enable_img = 1;
  41 + $CFG->filter_mediaplugin_enable_youtube = 1;
  42 + $CFG->filter_mediaplugin_enable_vimeo = 1;
  43 + $CFG->filter_mediaplugin_enable_mp3 = 1;
  44 + $CFG->filter_mediaplugin_enable_flv = 1;
  45 + $CFG->filter_mediaplugin_enable_swf = 1;
  46 + $CFG->filter_mediaplugin_enable_html5audio = 1;
  47 + $CFG->filter_mediaplugin_enable_html5video = 1;
  48 + $CFG->filter_mediaplugin_enable_qt = 1;
  49 + $CFG->filter_mediaplugin_enable_wmp = 1;
  50 + $CFG->filter_mediaplugin_enable_rm = 1;
55 51
56 52
57 53 $filterplugin = new filter_mediaplugin(null, array());
@@ -65,8 +61,6 @@ function test_filter_mediaplugin_link() {
65 61 '<a class="youtube" href="http://www.youtube.com/watch?v=JghQgA2HMX8">test file</a>',
66 62 '<a class="_blanktarget" href="http://moodle.org/testfile/test.flv?d=100x100">test flv</a>',
67 63 '<a class="hrefcss" href="http://www.youtube.com/watch?v=JghQgA2HMX8">test file</a>',
68   - '<a href="http://www.moodle.org/logo.jpg"><img src="http://moodle.org/test.jpg" /></a>',
69   - '<a href="http://www.moodle.org/logo.rpm">rpm file</a>',
70 64 '<a class="content" href="http://moodle.org/testfile/test.avi">test mp3</a>',
71 65 '<a id="audio" href="http://moodle.org/testfile/test.mp3">test mp3</a>',
72 66 '<a href="http://moodle.org/testfile/test.mp3">test mp3</a>',
@@ -103,12 +97,9 @@ function test_filter_mediaplugin_link() {
103 97 '<a href="http://moodle.org/testfile/test.mp3">test mp3',
104 98 '<a href="http://moodle.org/testfile/test.mp3"test</a>',
105 99 '<a href="http://moodle.org/testfile/">test</a>',
106   - '<a href="http://www.moodle.org/path/to/test.flv#param2=1?d=100x100">test</a>',
107 100 '<href="http://moodle.org/testfile/test.avi">test</a>',
108   - '<a ahref="http://moodle.org/testfile/test.mp3">test mp3</a>',
109 101 '<abbr href="http://moodle.org/testfile/test.mp3">test mp3</abbr>',
110 102 '<ahref="http://moodle.org/testfile/test.mp3">test mp3</a>',
111   - '<a class="content"href="http://moodle.org/testfile/test.mp3">test mp3</a>',
112 103 '<aclass="content" href="http://moodle.org/testfile/test.mp3">test mp3</a>'
113 104 );
114 105

0 comments on commit 1be2b90

Please sign in to comment.
Something went wrong with that request. Please try again.