From 7d6f4fa3930e7f101702171c5dd79fcd4277ec7b Mon Sep 17 00:00:00 2001
From: TotemAgency <46503988+TotemAgency@users.noreply.github.com>
Date: Tue, 15 Oct 2019 05:35:40 -0400
Subject: [PATCH 1/8] Set up CI with Azure Pipelines

[skip ci]
---
 azure-pipelines.yml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 azure-pipelines.yml

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
new file mode 100644
index 000000000..eaf129c81
--- /dev/null
+++ b/azure-pipelines.yml
@@ -0,0 +1,24 @@
+pool:
+  vmImage: 'ubuntu-16.04'
+trigger:
+  - master
+steps:
+  - task: CopyFiles@2
+    displayName: 'Copy Files to: $(build.artifactstagingdirectory)/Templates'
+    inputs:
+      SourceFolder: deployment
+      Contents: '*.json'
+      TargetFolder: '$(build.artifactstagingdirectory)/Templates'
+  - task: Npm@1
+    displayName: 'npm custom'
+    inputs:
+      command: custom
+      verbose: false
+      customCommand: 'install --production'
+  - task: ArchiveFiles@2
+    displayName: 'Archive $(Build.SourcesDirectory)'
+    inputs:
+      rootFolderOrFile: '$(Build.SourcesDirectory)'
+      includeRootFolder: false
+  - task: PublishBuildArtifacts@1
+    displayName: 'Publish Artifact: drop'

From 060aa76accc74072704b5cbb9b5d64000a019e10 Mon Sep 17 00:00:00 2001
From: TotemAgency <46503988+TotemAgency@users.noreply.github.com>
Date: Tue, 15 Oct 2019 05:43:32 -0400
Subject: [PATCH 2/8] Added build status badge

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ba478ab97..845ffd80c 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 
-
+[![Build Status](https://dev.azure.com/kshaub/ContosoAir/_apis/build/status/TotemAgency.ContosoAir?branchName=master)](https://dev.azure.com/kshaub/ContosoAir/_build/latest?definitionId=4&branchName=master)
 
 # Microsoft.Github CI Demo
 

From 7625b8d2e5f4e536d11c17c98a714a124ee364c0 Mon Sep 17 00:00:00 2001
From: TotemAgency <46503988+TotemAgency@users.noreply.github.com>
Date: Tue, 15 Oct 2019 05:46:37 -0400
Subject: [PATCH 3/8] Updated build pipeline

---
 azure-pipelines.yml | 38 +++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index eaf129c81..2e3a5a5d9 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -1,24 +1,36 @@
 pool:
-  vmImage: 'ubuntu-16.04'
+  vmImage: ubuntu-16.04
 trigger:
   - master
 steps:
-  - task: CopyFiles@2
-    displayName: 'Copy Files to: $(build.artifactstagingdirectory)/Templates'
-    inputs:
-      SourceFolder: deployment
-      Contents: '*.json'
-      TargetFolder: '$(build.artifactstagingdirectory)/Templates'
   - task: Npm@1
-    displayName: 'npm custom'
     inputs:
-      command: custom
-      verbose: false
-      customCommand: 'install --production'
+      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 $(Build.SourcesDirectory)'
+    displayName: 'Archive sources'
     inputs:
-      rootFolderOrFile: '$(Build.SourcesDirectory)'
+      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'

From 446307a560ad76f18d3633715fd0886ccf2891d8 Mon Sep 17 00:00:00 2001
From: TotemAgency <46503988+TotemAgency@users.noreply.github.com>
Date: Tue, 15 Oct 2019 06:39:13 -0400
Subject: [PATCH 4/8] Changes airport sorting. Fixes AB#2.

---
 src/services/airports.service.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/airports.service.js b/src/services/airports.service.js
index f9af6ab4f..276444bcf 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) {

From c9af05dc9c6de95ea54623e4f220cc1208907416 Mon Sep 17 00:00:00 2001
From: TotemAgency <46503988+TotemAgency@users.noreply.github.com>
Date: Tue, 15 Oct 2019 06:47:30 -0400
Subject: [PATCH 5/8] temp

---
 src/services/airports.service.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/airports.service.js b/src/services/airports.service.js
index 276444bcf..f9af6ab4f 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).sort((a, b) => (a.city > b.city) ? 1 : -1);
+        return this._airports.filter(a => a.code).map(avoidEmptyCity);
     }
 
     getByCode(code) {

From bf7f6b43df0cfb1156c895a83efb866cfe852d29 Mon Sep 17 00:00:00 2001
From: TotemAgency <46503988+TotemAgency@users.noreply.github.com>
Date: Tue, 15 Oct 2019 06:48:33 -0400
Subject: [PATCH 6/8] Changes airport sorting. Fixes AB#2.

---
 src/services/airports.service.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/airports.service.js b/src/services/airports.service.js
index f9af6ab4f..276444bcf 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) {

From d36549711b94a4f4bfbc58fbd4af28ed3e59d27e Mon Sep 17 00:00:00 2001
From: TotemAgency <46503988+TotemAgency@users.noreply.github.com>
Date: Tue, 15 Oct 2019 06:58:08 -0400
Subject: [PATCH 7/8] null

---
 src/services/airports.service.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/airports.service.js b/src/services/airports.service.js
index 276444bcf..f9af6ab4f 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).sort((a, b) => (a.city > b.city) ? 1 : -1);
+        return this._airports.filter(a => a.code).map(avoidEmptyCity);
     }
 
     getByCode(code) {

From 9ce552bed36d8a9b2a9fe59c4fe90f00a9c68d68 Mon Sep 17 00:00:00 2001
From: TotemAgency <46503988+TotemAgency@users.noreply.github.com>
Date: Tue, 15 Oct 2019 06:58:54 -0400
Subject: [PATCH 8/8] Changes airport sorting. Fixes AB#2.

---
 src/services/airports.service.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/airports.service.js b/src/services/airports.service.js
index f9af6ab4f..276444bcf 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) {