Merge pull request #223 from 3scale/release-3.0.0-alpha1

release 3.0.0-alpha1
3scale · Jan 16, 2017 · c2edcfc · c2edcfc
2 parents a7c3091 + 1a4d80d
commit c2edcfc
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 ### Added
+### Changed
+### Fixed
+### Removed
+
+## [3.0.0-alpha1] - 2017-01-16
+### Added
 - A CHANGELOG.md to track important changes
 - User-Agent header with APIcast version and system information [PR #214](https://github.com/3scale/apicast/pull/214)
 - Try to load configuration from V2 API [PR #193](https://github.com/3scale/apicast/pull/193)
@@ -15,13 +21,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - moved development from `v2` branch to `master` [PR #209](https://github.com/3scale/apicast/pull/209)
 - `X-3scale-Debug` HTTP header now uses Service Token [PR #217](https://github.com/3scale/apicast/pull/217)
 
-### Fixed
-
-### Removed
-
 ## [2.0.0] - 2016-11-29
 ### Changed
 - Major rewrite using JSON configuration instead of code generation.
 
 [Unreleased]: https://github.com/3scale/apicast/compare/v2.0.0...HEAD
 [2.0.0]: https://github.com/3scale/apicast/compare/v0.2...v2.0.0
+[3.0.0-alpha1]: https://github.com/3scale/apicast/compare/v2.0.0...v3.0.0-alpha1
diff --git a/apicast/src/apicast.lua b/apicast/src/apicast.lua
@@ -10,7 +10,7 @@ local reload_config = util.env_enabled('APICAST_RELOAD_CONFIG')
 local user_agent = require('user_agent')
 
 local _M = {
-  _VERSION = '2.0',
+  _VERSION = '3.0.0-pre',
   _NAME = 'APIcast'
 }
 

diff --git a/apicast/src/user_agent.lua b/apicast/src/user_agent.lua
@@ -4,7 +4,7 @@ local module = require 'module'
 local setmetatable = setmetatable
 
 local _M = {
-  _VERSION = '2.0'
+  _VERSION = '3.0.0-pre'
 }
 
 function _M.deployment()

diff --git a/spec/user_agent_spec.lua b/spec/user_agent_spec.lua
@@ -28,15 +28,15 @@ describe('3scale', function()
 
       user_agent.env.threescale_deployment_env = 'production'
 
-      assert.match('APIcast/' .. user_agent._VERSION, user_agent.call())
+      assert.match('APIcast/' .. user_agent._VERSION, user_agent.call(), nil, true)
     end)
 
     it('includes system information', function()
       assert.match('(' .. user_agent.system_information() .. ')', user_agent.call())
     end)
 
     it('includes platform information', function()
-      assert.match(' ' .. user_agent.platform(), user_agent.call())
+      assert.match(' ' .. user_agent.platform(), user_agent.call(), nil, true)
     end)
 
     it('works as tostring', function()