projects / moodle.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 90a8bdb)
MDL-55315 mod_lti: Fix Nginx 405 error
authorMark Nielsen <mark@moodlerooms.com>
Fri, 22 Jul 2016 18:18:55 +0000 (11:18 -0700)
committerMark Nielsen <mark@moodlerooms.com>
Fri, 22 Jul 2016 18:39:42 +0000 (11:39 -0700)
It appears that Nginx doesn't allow POST
to static files.  So rename the fixture from
a HTML file to a PHP file.

mod/lti/tests/behat/addtool.feature patch | blob | blame | history
mod/lti/tests/behat/addtype.feature patch | blob | blame | history
mod/lti/tests/behat/toolconfigure.feature patch | blob | blame | history
mod/lti/tests/fixtures/tool_provider.html [deleted file] patch | blob | blame | history
mod/lti/tests/fixtures/tool_provider.php [new file with mode: 0644] patch | blob

diff --git a/mod/lti/tests/behat/addtool.feature b/mod/lti/tests/behat/addtool.feature
index 6da74b4..27336fc 100644 (file)
--- a/mod/lti/tests/behat/addtool.feature
+++ b/mod/lti/tests/behat/addtool.feature
@@ -21,7 +21,7 @@ Feature: Add tools
     And I set the following fields to these values:
       | Tool name | Teaching Tool 1 |
       | Tool configuration usage | Show in activity chooser and as a preconfigured tool |
-    And I set the field "Tool base URL/cartridge URL" to local url "/mod/lti/tests/fixtures/tool_provider.html"
+    And I set the field "Tool base URL/cartridge URL" to local url "/mod/lti/tests/fixtures/tool_provider.php"
     And I press "Save changes"
     And I log out
 
diff --git a/mod/lti/tests/behat/addtype.feature b/mod/lti/tests/behat/addtype.feature
index ecf14a2..3d10586 100644 (file)
--- a/mod/lti/tests/behat/addtype.feature
+++ b/mod/lti/tests/behat/addtype.feature
@@ -67,7 +67,7 @@ Feature: Add preconfigured tools via teacher interface
       | Activity name | Test tool activity 1 |
     And I open "Test tool activity 1" actions menu
     And I follow "Edit settings" in the open menu
-    And I set the field "Launch/cartridge URL" to local url "/mod/lti/tests/fixtures/tool_provider.html"
+    And I set the field "Launch/cartridge URL" to local url "/mod/lti/tests/fixtures/tool_provider.php"
     And I press "Save and return to course"
     And I follow "Test tool activity 1"
     And I switch to "contentframe" iframe
diff --git a/mod/lti/tests/behat/toolconfigure.feature b/mod/lti/tests/behat/toolconfigure.feature
index e1afbda..b30f5b1 100644 (file)
--- a/mod/lti/tests/behat/toolconfigure.feature
+++ b/mod/lti/tests/behat/toolconfigure.feature
@@ -37,7 +37,7 @@ Feature: Configure tool types
 
   @javascript
   Scenario: Attempt to add a tool type from a configuration URL, then cancel
-    When I set the field "url" to local url "/mod/lti/tests/fixtures/tool_provider.html"
+    When I set the field "url" to local url "/mod/lti/tests/fixtures/tool_provider.php"
     And I press "Add"
     Then I should see "Cancel"
     And I press "cancel-external-registration"
diff --git a/mod/lti/tests/fixtures/tool_provider.html b/mod/lti/tests/fixtures/tool_provider.html
deleted file mode 100644 (file)
index 543a796..0000000
--- a/mod/lti/tests/fixtures/tool_provider.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<html>
-  <head>
-    <title>Tool provider</title>
-  </head>
-  <body>
-    <p>This represents a tool provider</p>
-  </body>
-</html>
diff --git a/mod/lti/tests/fixtures/tool_provider.php b/mod/lti/tests/fixtures/tool_provider.php
new file mode 100644 (file)
index 0000000..1f7f242
--- /dev/null
+++ b/mod/lti/tests/fixtures/tool_provider.php
@@ -0,0 +1,33 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Testing fixture.
+ *
+ * @package   mod_lti
+ * @copyright 2016 John Okely
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+?>
+<html>
+  <head>
+    <title>Tool provider</title>
+  </head>
+  <body>
+    <p>This represents a tool provider</p>
+  </body>
+</html>
Moodle official production repository