@@ -17,42 +17,42 @@ class AppDataConverterSpec: QuickSpec {
1717 }
1818
1919 it ( " includes the pipelines and jobs " ) {
20- let pipeline = ConcoursePipeline ( id: 1 , name: " test-pipeline " , paused : false , archived : false , public : false , team_name : self . teamName)
21- let successfulBuild = ConcourseBuild ( id: 1 , name: " 1 " , status: " succeeded " , start_time : 23894 , end_time : 30983 , team_name : self . teamName, pipeline_id : 1 , pipeline_name : " test-pipeline " , job_name : " test-job " )
20+ let pipeline = ConcoursePipeline ( id: 1 , name: " test-pipeline " , isPaused : false , isArchived : false , isPublic : false , teamName : self . teamName)
21+ let successfulBuild = ConcourseBuild ( id: 1 , name: " 1 " , status: " succeeded " , startTime : 23894 , endTime : 30983 , teamName : self . teamName, pipelineId : 1 , pipelineName : " test-pipeline " , jobName : " test-job " )
2222
23- let job = ConcourseJob ( id: 1 , name: " test-job " , team_name : self . teamName, pipeline_id : 1 , pipeline_name : " test-pipeline " , finished_build : successfulBuild)
23+ let job = ConcourseJob ( id: 1 , name: " test-job " , teamName : self . teamName, pipelineId : 1 , pipelineName : " test-pipeline " , finishedBuild : successfulBuild)
2424
2525 let team = AppDataConverter . convert ( pipelines: [ pipeline] , jobs: [ job] , url: self . url, teamName: self . teamName)
2626 expect ( team. pipelines) . to ( haveCount ( 1 ) )
2727 expect ( team. pipelines. first!. jobs) . to ( haveCount ( 1 ) )
2828 }
2929
3030 it ( " omits archived pipelines " ) {
31- let pipeline = ConcoursePipeline ( id: 1 , name: " test-pipeline " , paused : false , archived : true , public : false , team_name : self . teamName)
31+ let pipeline = ConcoursePipeline ( id: 1 , name: " test-pipeline " , isPaused : false , isArchived : true , isPublic : false , teamName : self . teamName)
3232 let team = AppDataConverter . convert ( pipelines: [ pipeline] , jobs: [ ] , url: self . url, teamName: self . teamName)
3333 expect ( team. pipelines) . to ( beEmpty ( ) )
3434 }
3535
3636 it ( " assigns the attributes to pipeline " ) {
37- let concoursePipeline = ConcoursePipeline ( id: 1 , name: " test-pipeline " , paused : false , archived : false , public : false , team_name : self . teamName)
37+ let concoursePipeline = ConcoursePipeline ( id: 1 , name: " test-pipeline " , isPaused : false , isArchived : false , isPublic : false , teamName : self . teamName)
3838
3939 let team = AppDataConverter . convert ( pipelines: [ concoursePipeline] , jobs: [ ] , url: self . url, teamName: self . teamName)
4040 let pipeline = team. pipelines. first!
4141 expect ( pipeline. id) . to ( equal ( 1 ) )
4242 expect ( pipeline. name) . to ( equal ( " test-pipeline " ) )
43- expect ( pipeline. paused ) . to ( beFalse ( ) )
44- expect ( pipeline. public ) . to ( beFalse ( ) )
43+ expect ( pipeline. isPaused ) . to ( beFalse ( ) )
44+ expect ( pipeline. isPublic ) . to ( beFalse ( ) )
4545 expect ( pipeline. concourseUrl) . to ( equal ( self . url) )
4646 expect ( pipeline. teamName) . to ( equal ( self . teamName) )
4747 }
4848
4949 it ( " assigns the attributes to the job " ) {
50- let concoursePipeline = ConcoursePipeline ( id: 1 , name: " test-pipeline " , paused : false , archived : false , public : false , team_name : self . teamName)
51- let transitionBuild = ConcourseBuild ( id: 1 , name: " 1 " , status: " succeeded " , start_time : 23894 , end_time : 30983 , team_name : self . teamName, pipeline_id : 1 , pipeline_name : " test-pipeline " , job_name : " test-job " )
52- let finishedBuild = ConcourseBuild ( id: 12 , name: " 12 " , status: " succeeded " , start_time : 52834 , end_time : 85465 , team_name : self . teamName, pipeline_id : 1 , pipeline_name : " test-pipeline " , job_name : " test-job " )
53- let nextBuild = ConcourseBuild ( id: 13 , name: " 13 " , status: " started " , start_time : 49764 , end_time : 46546 , team_name : self . teamName, pipeline_id : 1 , pipeline_name : " test-pipeline " , job_name : " test-job " )
50+ let concoursePipeline = ConcoursePipeline ( id: 1 , name: " test-pipeline " , isPaused : false , isArchived : false , isPublic : false , teamName : self . teamName)
51+ let transitionBuild = ConcourseBuild ( id: 1 , name: " 1 " , status: " succeeded " , startTime : 23894 , endTime : 30983 , teamName : self . teamName, pipelineId : 1 , pipelineName : " test-pipeline " , jobName : " test-job " )
52+ let finishedBuild = ConcourseBuild ( id: 12 , name: " 12 " , status: " succeeded " , startTime : 52834 , endTime : 85465 , teamName : self . teamName, pipelineId : 1 , pipelineName : " test-pipeline " , jobName : " test-job " )
53+ let nextBuild = ConcourseBuild ( id: 13 , name: " 13 " , status: " started " , startTime : 49764 , endTime : 46546 , teamName : self . teamName, pipelineId : 1 , pipelineName : " test-pipeline " , jobName : " test-job " )
5454
55- let concourseJob = ConcourseJob ( id: 1 , name: " test-job " , team_name : self . teamName, pipeline_id : 1 , pipeline_name : " test-pipeline " , finished_build : finishedBuild, transition_build : transitionBuild, next_build : nextBuild)
55+ let concourseJob = ConcourseJob ( id: 1 , name: " test-job " , teamName : self . teamName, pipelineId : 1 , pipelineName : " test-pipeline " , finishedBuild : finishedBuild, transitionBuild : transitionBuild, nextBuild : nextBuild)
5656
5757 let team = AppDataConverter . convert ( pipelines: [ concoursePipeline] , jobs: [ concourseJob] , url: self . url, teamName: self . teamName)
5858 let job = team. pipelines. first!. jobs. first!
@@ -64,12 +64,12 @@ class AppDataConverterSpec: QuickSpec {
6464 }
6565
6666 it ( " assigns the attributes to the builds " ) {
67- let concoursePipeline = ConcoursePipeline ( id: 1 , name: " test-pipeline " , paused : false , archived : false , public : false , team_name : self . teamName)
68- let tBuild = ConcourseBuild ( id: 1 , name: " 1 " , status: " succeeded " , start_time : 23894 , end_time : 30983 , team_name : self . teamName, pipeline_id : 1 , pipeline_name : " test-pipeline " , job_name : " test-job " )
69- let fBuild = ConcourseBuild ( id: 12 , name: " 12 " , status: " succeeded " , start_time : 52834 , end_time : 85465 , team_name : self . teamName, pipeline_id : 1 , pipeline_name : " test-pipeline " , job_name : " test-job " )
70- let nBuild = ConcourseBuild ( id: 13 , name: " 13 " , status: " started " , start_time : 49764 , end_time : 46546 , team_name : self . teamName, pipeline_id : 1 , pipeline_name : " test-pipeline " , job_name : " test-job " )
67+ let concoursePipeline = ConcoursePipeline ( id: 1 , name: " test-pipeline " , isPaused : false , isArchived : false , isPublic : false , teamName : self . teamName)
68+ let tBuild = ConcourseBuild ( id: 1 , name: " 1 " , status: " succeeded " , startTime : 23894 , endTime : 30983 , teamName : self . teamName, pipelineId : 1 , pipelineName : " test-pipeline " , jobName : " test-job " )
69+ let fBuild = ConcourseBuild ( id: 12 , name: " 12 " , status: " succeeded " , startTime : 52834 , endTime : 85465 , teamName : self . teamName, pipelineId : 1 , pipelineName : " test-pipeline " , jobName : " test-job " )
70+ let nBuild = ConcourseBuild ( id: 13 , name: " 13 " , status: " started " , startTime : 49764 , endTime : 46546 , teamName : self . teamName, pipelineId : 1 , pipelineName : " test-pipeline " , jobName : " test-job " )
7171
72- let concourseJob = ConcourseJob ( id: 1 , name: " test-job " , team_name : self . teamName, pipeline_id : 1 , pipeline_name : " test-pipeline " , finished_build : fBuild, transition_build : tBuild, next_build : nBuild)
72+ let concourseJob = ConcourseJob ( id: 1 , name: " test-job " , teamName : self . teamName, pipelineId : 1 , pipelineName : " test-pipeline " , finishedBuild : fBuild, transitionBuild : tBuild, nextBuild : nBuild)
7373
7474 let team = AppDataConverter . convert ( pipelines: [ concoursePipeline] , jobs: [ concourseJob] , url: self . url, teamName: self . teamName)
7575 let job = team. pipelines. first!. jobs. first!
@@ -99,11 +99,11 @@ class AppDataConverterSpec: QuickSpec {
9999
100100 it ( " includes only pipelines from the indicated team " ) {
101101 let pipelines = [
102- ConcoursePipeline ( id: 1 , name: " name-1 " , paused : false , archived : false , public : false , groups: nil , team_name : " test-team " , last_updated : nil ) ,
103- ConcoursePipeline ( id: 1 , name: " name-1 " , paused : false , archived : false , public : false , groups: nil , team_name : " not-test-team " , last_updated : nil ) ,
104- ConcoursePipeline ( id: 1 , name: " name-1 " , paused : false , archived : false , public : false , groups: nil , team_name : " not-test-team " , last_updated : nil ) ,
105- ConcoursePipeline ( id: 1 , name: " name-1 " , paused : false , archived : false , public : false , groups: nil , team_name : " another-test-team " , last_updated : nil ) ,
106- ConcoursePipeline ( id: 1 , name: " name-1 " , paused : false , archived : false , public : false , groups: nil , team_name : " test-team " , last_updated : nil ) ,
102+ ConcoursePipeline ( id: 1 , name: " name-1 " , isPaused : false , isArchived : false , isPublic : false , groups: nil , teamName : " test-team " , lastUpdated : nil ) ,
103+ ConcoursePipeline ( id: 1 , name: " name-1 " , isPaused : false , isArchived : false , isPublic : false , groups: nil , teamName : " not-test-team " , lastUpdated : nil ) ,
104+ ConcoursePipeline ( id: 1 , name: " name-1 " , isPaused : false , isArchived : false , isPublic : false , groups: nil , teamName : " not-test-team " , lastUpdated : nil ) ,
105+ ConcoursePipeline ( id: 1 , name: " name-1 " , isPaused : false , isArchived : false , isPublic : false , groups: nil , teamName : " another-test-team " , lastUpdated : nil ) ,
106+ ConcoursePipeline ( id: 1 , name: " name-1 " , isPaused : false , isArchived : false , isPublic : false , groups: nil , teamName : " test-team " , lastUpdated : nil ) ,
107107 ]
108108
109109 let team = AppDataConverter . convert ( pipelines: pipelines, jobs: [ ] , url: URL ( string: " http://localhost " ) !, teamName: " test-team " )
0 commit comments