Merge branch 'develop'

routes/media.php

@@ -6,7 +6,8 @@
     'middleware' => ['scope:media', 'expiration']
 ], function () use ($router) {
     // Public access
-    $router->get('/', 'MediaController@index');
+    // Disabled since there is no use for it and it brings rackspace down when we get the real filename of an image
+    // $router->get('/', 'MediaController@index');
     $router->get('/{id}', 'MediaController@show');
     // Public can upload media
     $router->post('/', 'MediaController@store');

tests/integration/media.feature

@@ -78,34 +78,6 @@ Feature: Testing the Media API
         And the response has a "errors" property
         Then the guzzle status code should be 404
 
-    @resetFixture
-    Scenario: Listing all Media
-        Given that I want to get all "Media"
-        When I request "/media"
-        Then the response is JSON
-        And the response has a "count" property
-        And the type of the "count" property is "numeric"
-        And the "count" property equals "4"
-        Then the guzzle status code should be 200
-
-    @resetFixture
-    Scenario: Listing All Media with limit and offset
-        Given that I want to get all "Media"
-        And that the request "query string" is:
-            """
-            limit=1&offset=1
-            """
-        When I request "/media"
-        Then the response is JSON
-        And the response has a "count" property
-        And the type of the "count" property is "numeric"
-        And the "count" property equals "1"
-        And the response has a "next" property
-        And the response has a "prev" property
-        And the response has a "curr" property
-        And the "results.0.id" property equals "2"
-        Then the guzzle status code should be 200
-
     Scenario: Fail to delete a non existent Media
         Given that I want to delete a "Media"
         And that its "id" is "10"