Adding tests to validate that Generation supports SemVer patches.

Resolves #34
erunion · erunion · Feb 25, 2017 · Feb 25, 2017 · Feb 25, 2017 · 7f9c73220e7ed448977e39065fba7bad21fedf5e
commit 7f9c73220e7ed448977e39065fba7bad21fedf5e
diff --git a/resources/examples/Showtimes/Controllers/Movie.php b/resources/examples/Showtimes/Controllers/Movie.php
@@ -45,7 +45,6 @@ public function GET()
  * @api-param:public {string} runtime (optional) Movie runtime, in `HHhr MMmin` format.
  * @api-param:public {string} content_rating [G|PG|PG-13|R|NC-17|X|NR|UR] (optional) MPAA rating
  * @api-param:public {array} genres (optional) Array of movie genres.
- * @api-param:public {string} imdb (optional) IMDB URL
  * @api-param:public {string} trailer (optional) Trailer URL
  * @api-param:public {string} director (optional) Name of the director.
  * @api-param:public {array} cast (optional) Array of names of the cast.
@@ -56,6 +55,9 @@ public function GET()
  * request.
  * @api-throws:public {400} \Mill\Examples\Showtimes\Representations\Error If the IMDB URL could not be validated.
  * @api-throws:public {404} \Mill\Examples\Showtimes\Representations\Error If the movie could not be found.
+ *
+ * @api-version >=1.1.1
+ * @api-param:public {string} imdb (optional) IMDB URL
  */
  public function PATCH()
  {

diff --git a/resources/examples/Showtimes/Controllers/Movies.php b/resources/examples/Showtimes/Controllers/Movies.php
@@ -50,7 +50,7 @@ public function GET()
  * request.
  * @api-throws:public {400} \Mill\Examples\Showtimes\Representations\Error If the IMDB URL could not be validated.
  *
- * @api-version 1.1
+ * @api-version >=1.1
  * @api-param:public {string} imdb (optional) IMDB URL
  * @api-param:public {string} trailer (optional) Trailer URL
  */

diff --git a/resources/examples/Showtimes/Representations/Movie.php b/resources/examples/Showtimes/Representations/Movie.php
@@ -67,7 +67,7 @@ public function create()
  * @api-label Urls
  * @api-field urls
  * @api-type object
- * @api-version 1.1
+ * @api-version >=1.1
  * @api-see \Mill\Examples\Showtimes\Representations\Movie::getUrls urls
  */
  'urls' => $this->getUrls(),

diff --git a/resources/examples/Showtimes/blueprints/1.1.1/Movies.apib b/resources/examples/Showtimes/blueprints/1.1.1/Movies.apib
@@ -0,0 +1,191 @@
+FORMAT: 1A
+
+# Movies
+## Movies [/movies/{id}]
+Information on a specific movie.
+
+### Get a single movie. [GET]
++ Parameters
+ + `id` (integer, required) - Movie ID
++ Response 200 (application/json)
+ + Attributes
+ - `cast` (array) - Cast
+ - `content_rating` (enum[string]) - MPAA rating
+ + Members
+ + `G`
+ + `PG`
+ + `PG-13`
+ + `R`
+ + `NC-17`
+ + `X`
+ + `NR`
+ + `UR`
+ - `description` (string) - Description
+ - `director` (string) - Director
+ - `genres` (array) - Genres
+ - `id` (number) - Unique ID
+ - `name` (string) - Name
+ - `runtime` (string) - Runtime
+ - `showtimes` (array) - Non-theater specific showtimes
+ - `theaters` (array) - Theaters the movie is currently showing in
+ - `uri` (string) - Movie URI
+ - `urls` (object) - Urls
+ - `imdb` (string) - IMDB URL
+ - `tickets` (string) - Tickets URL
+ - `trailer` (string) - Trailer URL
++ Response 304 (application/json)
++ Response 404 (application/json)
+
+### Update a movie. [PATCH]
+This action requires a bearer token with `edit` scope.
+
++ Parameters
+ + `id` (integer, required) - Movie ID
++ Request
+ + Attributes
+ - `name` (string, required) - Name of the movie.
+ - `description` (string, required) - Description, or tagline, for the movie.
+ - `runtime` (string) - Movie runtime, in `HHhr MMmin` format.
+ - `content_rating` (enum[string]) - MPAA rating
+ + Members
+ + `G`
+ + `PG`
+ + `PG-13`
+ + `R`
+ + `NC-17`
+ + `X`
+ + `NR`
+ + `UR`
+ - `genres` (string) - Array of movie genres.
+ - `trailer` (string) - Trailer URL
+ - `director` (string) - Name of the director.
+ - `cast` (string) - Array of names of the cast.
+ - `imdb` (string) - IMDB URL
++ Response 200 (application/json)
+ + Attributes
+ - `cast` (array) - Cast
+ - `content_rating` (enum[string]) - MPAA rating
+ + Members
+ + `G`
+ + `PG`
+ + `PG-13`
+ + `R`
+ + `NC-17`
+ + `X`
+ + `NR`
+ + `UR`
+ - `description` (string) - Description
+ - `director` (string) - Director
+ - `genres` (array) - Genres
+ - `id` (number) - Unique ID
+ - `name` (string) - Name
+ - `runtime` (string) - Runtime
+ - `showtimes` (array) - Non-theater specific showtimes
+ - `theaters` (array) - Theaters the movie is currently showing in
+ - `uri` (string) - Movie URI
+ - `urls` (object) - Urls
+ - `imdb` (string) - IMDB URL
+ - `tickets` (string) - Tickets URL
+ - `trailer` (string) - Trailer URL
++ Response 400 (application/json)
+ There are 2 ways that this status code can be encountered.
+ * If there is a problem with the request.
+ * If the IMDB URL could not be validated.
++ Response 404 (application/json)
+
+### Delete a movie. [DELETE]
+This action requires a bearer token with `delete` scope.
+
++ Parameters
+ + `id` (integer, required) - Movie ID
++ Response 204 (application/json)
++ Response 404 (application/json)
+
+## Movies [/movies]
+Information on a specific movie.
+
+### Get movies. [GET]
++ Request
+ + Attributes
+ - `location` (string, required) - Location you want movies for.
++ Response 200 (application/json)
+ + Attributes
+ - `cast` (array) - Cast
+ - `content_rating` (enum[string]) - MPAA rating
+ + Members
+ + `G`
+ + `PG`
+ + `PG-13`
+ + `R`
+ + `NC-17`
+ + `X`
+ + `NR`
+ + `UR`
+ - `description` (string) - Description
+ - `director` (string) - Director
+ - `genres` (array) - Genres
+ - `id` (number) - Unique ID
+ - `name` (string) - Name
+ - `runtime` (string) - Runtime
+ - `showtimes` (array) - Non-theater specific showtimes
+ - `theaters` (array) - Theaters the movie is currently showing in
+ - `uri` (string) - Movie URI
+ - `urls` (object) - Urls
+ - `imdb` (string) - IMDB URL
+ - `tickets` (string) - Tickets URL
+ - `trailer` (string) - Trailer URL
++ Response 400 (application/json)
+
+### Create a movie. [POST]
+This action requires a bearer token with `create` scope.
+
++ Request
+ + Attributes
+ - `name` (string, required) - Name of the movie.
+ - `description` (string, required) - Description, or tagline, for the movie.
+ - `runtime` (string) - Movie runtime, in `HHhr MMmin` format.
+ - `content_rating` (enum[string]) - MPAA rating
+ + Members
+ + `G`
+ + `PG`
+ + `PG-13`
+ + `R`
+ + `NC-17`
+ + `X`
+ + `NR`
+ + `UR`
+ - `genres` (string) - Array of movie genres.
+ - `director` (string) - Name of the director.
+ - `cast` (string) - Array of names of the cast.
+ - `imdb` (string) - IMDB URL
+ - `trailer` (string) - Trailer URL
++ Response 200 (application/json)
+ + Attributes
+ - `cast` (array) - Cast
+ - `content_rating` (enum[string]) - MPAA rating
+ + Members
+ + `G`
+ + `PG`
+ + `PG-13`
+ + `R`
+ + `NC-17`
+ + `X`
+ + `NR`
+ + `UR`
+ - `description` (string) - Description
+ - `director` (string) - Director
+ - `genres` (array) - Genres
+ - `id` (number) - Unique ID
+ - `name` (string) - Name
+ - `runtime` (string) - Runtime
+ - `showtimes` (array) - Non-theater specific showtimes
+ - `theaters` (array) - Theaters the movie is currently showing in
+ - `uri` (string) - Movie URI
+ - `urls` (object) - Urls
+ - `imdb` (string) - IMDB URL
+ - `tickets` (string) - Tickets URL
+ - `trailer` (string) - Trailer URL
++ Response 400 (application/json)
+ There are 2 ways that this status code can be encountered.
+ * If there is a problem with the request.
+ * If the IMDB URL could not be validated.
diff --git a/resources/examples/Showtimes/blueprints/1.1.1/Theaters.apib b/resources/examples/Showtimes/blueprints/1.1.1/Theaters.apib
@@ -0,0 +1,87 @@
+FORMAT: 1A
+
+# Theaters
+## Movie Theaters [/theaters/{id}]
+Information on a specific movie theater.
+
+### Get a single movie theater [GET]
++ Parameters
+ + `id` (integer, required) - Theater ID
++ Response 200 (application/json)
+ + Attributes
+ - `address` (string) - Address
+ - `id` (number) - Unique ID
+ - `movies` (array) - Movies currently playing
+ - `name` (string) - Name
+ - `phone_number` (string) - Phone number
+ - `showtimes` (array) - Non-movie specific showtimes
+ - `uri` (string) - Theater URI
++ Response 304 (application/json)
++ Response 404 (application/json)
+
+### Update a movie theater [PATCH]
+This action requires a bearer token with `create` scope.
+
++ Parameters
+ + `id` (integer, required) - Theater ID
++ Request
+ + Attributes
+ - `name` (string, required) - Name of the theater.
+ - `address` (string, required) - Theater address
+ - `phone_number` (string, required) - Theater phone number
++ Response 200 (application/json)
+ + Attributes
+ - `address` (string) - Address
+ - `id` (number) - Unique ID
+ - `movies` (array) - Movies currently playing
+ - `name` (string) - Name
+ - `phone_number` (string) - Phone number
+ - `showtimes` (array) - Non-movie specific showtimes
+ - `uri` (string) - Theater URI
++ Response 400 (application/json)
++ Response 404 (application/json)
+
+### Delete a movie movie. [DELETE]
+This action requires a bearer token with `delete` scope.
+
++ Parameters
+ + `id` (integer, required) - Theater ID
++ Response 204 (application/json)
++ Response 404 (application/json)
+
+## Movie Theaters [/theaters]
+Information on a specific movie theater.
+
+### Get movie theaters. [GET]
++ Request
+ + Attributes
+ - `location` (string, required) - Location you want theaters in.
++ Response 200 (application/json)
+ + Attributes
+ - `address` (string) - Address
+ - `id` (number) - Unique ID
+ - `movies` (array) - Movies currently playing
+ - `name` (string) - Name
+ - `phone_number` (string) - Phone number
+ - `showtimes` (array) - Non-movie specific showtimes
+ - `uri` (string) - Theater URI
++ Response 400 (application/json)
+
+### Create a movie theater. [POST]
+This action requires a bearer token with `create` scope.
+
++ Request
+ + Attributes
+ - `name` (string, required) - Name of the theater.
+ - `address` (string, required) - Theater address
+ - `phone_number` (string, required) - Theater phone number
++ Response 200 (application/json)
+ + Attributes
+ - `address` (string) - Address
+ - `id` (number) - Unique ID
+ - `movies` (array) - Movies currently playing
+ - `name` (string) - Name
+ - `phone_number` (string) - Phone number
+ - `showtimes` (array) - Non-movie specific showtimes
+ - `uri` (string) - Theater URI
++ Response 400 (application/json)
diff --git a/resources/examples/Showtimes/blueprints/1.1/Movies.apib b/resources/examples/Showtimes/blueprints/1.1/Movies.apib
@@ -57,7 +57,6 @@ This action requires a bearer token with `edit` scope.
  + `NR`
  + `UR`
  - `genres` (string) - Array of movie genres.
- - `imdb` (string) - IMDB URL
  - `trailer` (string) - Trailer URL
  - `director` (string) - Name of the director.
  - `cast` (string) - Array of names of the cast.

diff --git a/resources/examples/mill.xml b/resources/examples/mill.xml
@@ -5,7 +5,8 @@
 >
  <versions>
  <version name="1.0" />
- <version name="1.1" default="true" />
+ <version name="1.1" />
+ <version name="1.1.1" default="true" />
  </versions>
 
  <controllers>

diff --git a/tests/Command/GenerateTest.php b/tests/Command/GenerateTest.php
@@ -57,7 +57,8 @@ public function testGenerate()
  '.',
  '..',
  '1.0',
- '1.1'
+ '1.1',
+ '1.1.1'
  ], scandir($output_dir));
 
  $blueprints_dir = __DIR__ . '/../../resources/examples/Showtimes/blueprints';

diff --git a/tests/ConfigTest.php b/tests/ConfigTest.php
@@ -10,12 +10,13 @@ public function testLoadFromXML()
  $config = $this->getConfig();
 
  $this->assertSame('1.0', $config->getFirstApiVersion());
- $this->assertSame('1.1', $config->getDefaultApiVersion());
- $this->assertSame('1.1', $config->getLatestApiVersion());
+ $this->assertSame('1.1.1', $config->getDefaultApiVersion());
+ $this->assertSame('1.1.1', $config->getLatestApiVersion());
 
  $this->assertSame([
  '1.0',
- '1.1'
+ '1.1',
+ '1.1.1'
  ], $config->getApiVersions());
 
  $this->assertSame([