Skip to content
This repository has been archived by the owner on Feb 28, 2020. It is now read-only.

Commit

Permalink
Merge pull request #692 from IBM-Swift/updateTo5.13.1
Browse files Browse the repository at this point in the history
Release 5.13.1
  • Loading branch information
Christian Compton authored Apr 25, 2019
2 parents 632bf3d + 5df7047 commit 2b3bc3f
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 11 deletions.
5 changes: 5 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

<a name="5.13.1"></a>
## [5.13.1](https://github.com/IBM-Swift/generator-swiftserver/compare/5.13.0...5.13.1) (2019-04-25)



<a name="5.13.0"></a>
# [5.13.0](https://github.com/IBM-Swift/generator-swiftserver/compare/5.12.1...5.13.0) (2019-04-18)

Expand Down
6 changes: 3 additions & 3 deletions app/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -980,9 +980,9 @@ module.exports = Generator.extend({
}
}
switch (answers.pushNotificationsRegion) {
case 'US South': this.services.push.url = 'http://imfpush.ng.bluemix.net'; break
case 'United Kingdom': this.services.push.url = 'http://imfpush.eu-gb.bluemix.net'; break
case 'Sydney': this.services.push.url = 'http://imfpush.au-syd.bluemix.net'; break
case 'US South': this.services.push.url = 'https://imfpush.ng.bluemix.net'; break
case 'United Kingdom': this.services.push.url = 'https://imfpush.eu-gb.bluemix.net'; break
case 'Sydney': this.services.push.url = 'https://imfpush.au-syd.bluemix.net'; break
default:
this.env.error(chalk.red(`Internal error: unknown region ${answers.pushNotificationsRegion}`))
}
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "generator-swiftserver",
"version": "5.13.0",
"version": "5.13.1",
"description": "Generator for Kitura REST webservice servers",
"main": "app/index.js",
"scripts": {
Expand Down
6 changes: 3 additions & 3 deletions test/integration/app/prompted_nobuild.js
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ describe('Integration tests (prompt no build) for swiftserver:app', function ()
var sdkScope

before(function () {
swaggerScope = nock('http://dino.io')
swaggerScope = nock('https://dino.io')
.get('/stuff')
.replyWithFile(200, inputSwaggerFile)

Expand All @@ -587,7 +587,7 @@ describe('Integration tests (prompt no build) for swiftserver:app', function ()
capabilities: [],
endpoints: [ 'Endpoints from swagger file' ],
swaggerChoice: 'Custom swagger file',
path: 'http://dino.io/stuff'
path: 'https://dino.io/stuff'
})
return runContext.toPromise()
})
Expand Down Expand Up @@ -1285,7 +1285,7 @@ describe('Integration tests (prompt no build) for swiftserver:app', function ()
appGuid: 'myAppGuid',
apikey: 'myAPIKey',
clientSecret: '',
url: 'http://imfpush.eu-gb.bluemix.net'
url: 'https://imfpush.eu-gb.bluemix.net'
})
})
})
Expand Down
6 changes: 3 additions & 3 deletions test/unit/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -1037,7 +1037,7 @@ describe('Unit tests for swiftserver:app', function () {
capabilities: [],
endpoints: [ 'Endpoints from swagger file' ],
swaggerChoice: 'Custom swagger file',
path: 'http://dino.io/stuff'
path: 'https://dino.io/stuff'
})
return runContext.toPromise()
})
Expand All @@ -1053,7 +1053,7 @@ describe('Unit tests for swiftserver:app', function () {
generateCodableRoutes: true,
capabilities: [],
services: {},
fromSwagger: 'http://dino.io/stuff'
fromSwagger: 'https://dino.io/stuff'
}))
})
})
Expand Down Expand Up @@ -1698,7 +1698,7 @@ describe('Unit tests for swiftserver:app', function () {
},
appGuid: 'myAppGuid',
apikey: 'myAPIKey',
url: 'http://imfpush.ng.bluemix.net'
url: 'https://imfpush.ng.bluemix.net'
}
}
}))
Expand Down

0 comments on commit 2b3bc3f

Please sign in to comment.