diff --git a/README.md b/README.md index ba478ab97..87b87ead0 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ +[![Build Status](https://dev.azure.com/risilvei/GitHub/_apis/build/status/ritascosta.ContosoAir?branchName=master)](https://dev.azure.com/risilvei/GitHub/_build/latest?definitionId=26&branchName=master) - +Rita # Microsoft.Github CI Demo diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 000000000..c20ffdaf7 --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,41 @@ +# Node.js +# Build a general Node.js project with npm. +# Add steps that analyze code, save build artifacts, deploy, and more: +# https://docs.microsoft.com/azure/devops/pipelines/languages/javascript + +pool: + vmImage: ubuntu-16.04 +trigger: + - master +steps: + - task: Npm@1 + inputs: + command: install + - script: 'npm test' + displayName: 'Run unit tests' + continueOnError: true + - task: PublishTestResults@2 + displayName: 'Publish Test Results' + condition: succeededOrFailed() + inputs: + testResultsFiles: $(System.DefaultWorkingDirectory)/test-report.xml + - task: PublishCodeCoverageResults@1 + displayName: 'Publish Code Coverage' + condition: 'in(variables[''Agent.JobStatus''], ''Succeeded'')' + inputs: + codeCoverageTool: Cobertura + summaryFileLocation: '$(System.DefaultWorkingDirectory)/coverage/*coverage.xml' + reportDirectory: $(System.DefaultWorkingDirectory)/coverage + - task: ArchiveFiles@2 + displayName: 'Archive sources' + inputs: + rootFolderOrFile: $(Build.SourcesDirectory) + includeRootFolder: false + - task: CopyFiles@2 + displayName: 'Copy ARM templates' + inputs: + SourceFolder: deployment + Contents: '*.json' + TargetFolder: $(build.artifactstagingdirectory)/Templates + - task: PublishBuildArtifacts@1 + displayName: 'Publish Artifact: drop' diff --git a/src/services/airports.service.js b/src/services/airports.service.js index f9af6ab4f..cf5cb2331 100644 --- a/src/services/airports.service.js +++ b/src/services/airports.service.js @@ -8,7 +8,7 @@ class AirportsService { } getAll(){ - return this._airports.filter(a => a.code).map(avoidEmptyCity); + return this._airports.filter(a => a.code).map(avoidEmptyCity).sort((a, b) => (a.city > b.city) ? 1 : -1); } getByCode(code) { @@ -16,4 +16,5 @@ class AirportsService { } } -module.exports = AirportsService; \ No newline at end of file +module.exports = AirportsService; +//end