@@ -99,11 +99,7 @@ class GitHubTests: XCTestCase {
9999
100100 let app = TestHelper . launchApp ( pipelines: " EmptyPipelines.json " , pauseMonitor: false )
101101 let window = app. windows [ " Pipelines " ]
102- let sheet = window. sheets. firstMatch
103-
104- // Navigate to add workflow sheet
105- window. toolbars. popUpButtons [ " Add pipeline menu " ] . click ( )
106- window. toolbars. menuItems [ " Add GitHub Actions workflow... " ] . click ( )
102+ let sheet = openAddGitHubPipelineSheet ( app: app)
107103
108104 // Enter owner
109105 sheet. textFields [ " Owner field " ] . click ( )
@@ -155,11 +151,7 @@ class GitHubTests: XCTestCase {
155151
156152 let app = TestHelper . launchApp ( pipelines: " EmptyPipelines.json " , pauseMonitor: false )
157153 let window = app. windows [ " Pipelines " ]
158- let sheet = window. sheets. firstMatch
159-
160- // Navigate to add workflow sheet
161- window. toolbars. popUpButtons [ " Add pipeline menu " ] . click ( )
162- window. toolbars. menuItems [ " Add GitHub Actions workflow... " ] . click ( )
154+ let sheet = openAddGitHubPipelineSheet ( app: app)
163155
164156 // Enter owner
165157 sheet. textFields [ " Owner field " ] . click ( )
@@ -202,11 +194,7 @@ class GitHubTests: XCTestCase {
202194
203195 let app = TestHelper . launchApp ( pipelines: " EmptyPipelines.json " , pauseMonitor: false )
204196 let window = app. windows [ " Pipelines " ]
205- let sheet = window. sheets. firstMatch
206-
207- // Navigate to add workflow sheet
208- window. toolbars. popUpButtons [ " Add pipeline menu " ] . click ( )
209- window. toolbars. menuItems [ " Add GitHub Actions workflow... " ] . click ( )
197+ let sheet = openAddGitHubPipelineSheet ( app: app)
210198
211199 // Enter owner
212200 sheet. textFields [ " Owner field " ] . click ( )
@@ -231,7 +219,7 @@ class GitHubTests: XCTestCase {
231219 XCTAssertEqual ( " main " , branchParam)
232220 }
233221
234- func testAddGitHubPipelinePrivateRepos ( ) throws {
222+ func testFindsPrivateReposForUser ( ) throws {
235223 webapp. router. get ( " /users/erikdoe " ) { _ in
236224 try TestHelper . contentsOfFile ( " GitHubUserResponse.json " )
237225 }
@@ -243,23 +231,17 @@ class GitHubTests: XCTestCase {
243231 }
244232
245233 let app = TestHelper . launchApp ( pipelines: " EmptyPipelines.json " , pauseMonitor: false , token: " TEST-TOKEN " )
246- let window = app. windows [ " Pipelines " ]
247- let sheet = window. sheets. firstMatch
248-
249- // Navigate to add workflow sheet
250- window. toolbars. popUpButtons [ " Add pipeline menu " ] . click ( )
251- window. toolbars. menuItems [ " Add GitHub Actions workflow... " ] . click ( )
234+ let sheet = openAddGitHubPipelineSheet ( app: app)
252235
253236 // Make sure the token is shown
254237 let tokenField = sheet. textFields [ " Token field " ]
255238 XCTAssertEqual ( " TEST-TOKEN " , tokenField. value as? String )
256239
257240 // Enter owner and wait for the repo list to load
258- let ownerField = sheet. textFields [ " Owner field " ]
259- ownerField. click ( )
241+ sheet. textFields [ " Owner field " ] . click ( )
260242 sheet. typeText ( " erikdoe " + " \n " )
261243
262- // Make sure that the repositories are loaded and sorted
244+ // Make sure that the repositories are loaded
263245 let repositoryBox = sheet. comboBoxes [ " Repository combo box " ]
264246 expectation ( for: NSPredicate ( format: " value == 'ccmenu' " ) , evaluatedWith: repositoryBox)
265247 waitForExpectations ( timeout: 2 )
@@ -274,6 +256,27 @@ class GitHubTests: XCTestCase {
274256 XCTAssertTrue ( repositoryBox. textFields [ " jekyll-site-test " ] . exists)
275257 }
276258
259+ func testRetrievesReposForOrg( ) throws {
260+ webapp. router. get ( " /users/ccmenu " ) { _ in
261+ try TestHelper . contentsOfFile ( " GitHubUserOrgResponse.json " )
262+ }
263+ webapp. router. get ( " /orgs/ccmenu/repos " ) { _ in
264+ try TestHelper . contentsOfFile ( " GitHubReposByOrgResponse.json " )
265+ }
266+
267+ let app = TestHelper . launchApp ( pipelines: " EmptyPipelines.json " , pauseMonitor: false )
268+ let sheet = openAddGitHubPipelineSheet ( app: app)
269+
270+ // Enter owner
271+ sheet. textFields [ " Owner field " ] . click ( )
272+ sheet. typeText ( " ccmenu " + " \n " )
273+
274+ // Make sure that the repositories and workflows are loaded and the default display name is set
275+ let repositoryBox = sheet. comboBoxes [ " Repository combo box " ]
276+ expectation ( for: NSPredicate ( format: " value == 'ccmenu' " ) , evaluatedWith: repositoryBox)
277+ waitForExpectations ( timeout: 3 )
278+ }
279+
277280 func testShowsRateLimitExceededForRepositories( ) throws {
278281 webapp. router. get ( " /users/erikdoe " , options: . editResponse) { r -> String in
279282 r. response. status = . forbidden
@@ -282,12 +285,7 @@ class GitHubTests: XCTestCase {
282285 }
283286
284287 let app = TestHelper . launchApp ( pipelines: " EmptyPipelines.json " , pauseMonitor: false )
285- let window = app. windows [ " Pipelines " ]
286- let sheet = window. sheets. firstMatch
287-
288- // Navigate to add workflow sheet
289- window. toolbars. popUpButtons [ " Add pipeline menu " ] . click ( )
290- window. toolbars. menuItems [ " Add GitHub Actions workflow... " ] . click ( )
288+ let sheet = openAddGitHubPipelineSheet ( app: app)
291289
292290 // Enter owner
293291 sheet. textFields [ " Owner field " ] . click ( )
@@ -310,16 +308,10 @@ class GitHubTests: XCTestCase {
310308 }
311309
312310 let app = TestHelper . launchApp ( pipelines: " EmptyPipelines.json " )
313- let window = app. windows [ " Pipelines " ]
314- let sheet = window. sheets. firstMatch
315-
316- // Navigate to add workflow sheet
317- window. toolbars. popUpButtons [ " Add pipeline menu " ] . click ( )
318- window. toolbars. menuItems [ " Add GitHub Actions workflow... " ] . click ( )
311+ let sheet = openAddGitHubPipelineSheet ( app: app)
319312
320313 // Enter owner and wait for the repo list to load
321- let ownerField = sheet. textFields [ " Owner field " ]
322- ownerField. click ( )
314+ sheet. textFields [ " Owner field " ] . click ( )
323315 sheet. typeText ( " erikdoe " ) // Note: not pressing return here
324316
325317 // Make sure that the repositories are loaded and sorted
@@ -330,9 +322,18 @@ class GitHubTests: XCTestCase {
330322 // Now press return and wait for a little while
331323 sheet. typeText ( " \n " )
332324 Thread . sleep ( forTimeInterval: 1 )
333-
325+
334326 // Assert that no further fetch occured
335327 XCTAssertEqual ( 1 , fetchCount)
328+
329+ }
330+
331+ private func openAddGitHubPipelineSheet( app: XCUIApplication ) -> XCUIElement {
332+ let window = app. windows [ " Pipelines " ]
333+ let sheet = window. sheets. firstMatch
334+ window. toolbars. popUpButtons [ " Add pipeline menu " ] . click ( )
335+ window. toolbars. menuItems [ " Add GitHub Actions workflow... " ] . click ( )
336+ return sheet
336337 }
337338
338339}
0 commit comments