fix: use cwd param for target (#227)

spec/element-spec.js

@@ -178,24 +178,11 @@ describe('XTerminalElement', () => {
 		expect(cwd).toBe(expected)
 	})
 
-	it('getCwd() cwd set if target in uri', async () => {
-		const expected = tmpdir
-		const element = await createNewElement(null, { target: expected })
-		const cwd = await element.getCwd()
-		expect(cwd).toBe(expected)
-	})
-
-	it('getCwd() ignore cwd in target if projectCwd is set', async () => {
-		const expected = await temp.mkdir('targetCwd')
-		const element = await createNewElement({ cwd: tmpdir }, { target: expected })
-		const cwd = await element.getCwd()
-		expect(cwd).toBe(expected)
-	})
-
-	it('getCwd() ignore cwd in uri if projectCwd is set', async () => {
+	it('getCwd() ignore cwd base profile if projectCwd is set', async () => {
+		atom.config.set('x-terminal.spawnPtySettings.cwd', tmpdir)
 		const expected = await temp.mkdir('projectCwd')
 		spyOn(atom.project, 'getPaths').and.returnValue([expected])
-		const element = await createNewElement({ projectCwd: true, cwd: tmpdir })
+		const element = await createNewElement({ projectCwd: true })
 		const cwd = await element.getCwd()
 		expect(cwd).toBe(expected)
 	})

spec/model-spec.js

@@ -81,17 +81,12 @@ describe('XTerminalModel', () => {
 		expect(model.getPath()).toBe(tmpdir)
 	})
 
-	it('use target with valid cwd passed in uri', async () => {
-		const expected = await temp.mkdir('targetCwd')
-		const model = await createNewModel({ cwd: tmpdir }, { target: expected })
-		expect(model.getPath()).toBe(expected)
-	})
-
 	it('use projectCwd with valid cwd passed in uri', async () => {
+		atom.config.set('x-terminal.spawnPtySettings.cwd', tmpdir)
 		const expected = await temp.mkdir('projectCwd')
 		spyOn(atom.project, 'getPaths').and.returnValue([expected])
 		spyOn(atom.workspace, 'getActivePaneItem').and.returnValue({})
-		const model = await createNewModel({ projectCwd: true, cwd: tmpdir })
+		const model = await createNewModel({ projectCwd: true })
 		expect(model.getPath()).toBe(expected)
 	})
 

spec/x-terminal-spec.js

@@ -240,4 +240,31 @@ describe('x-terminal', () => {
 			expect(activeTerminal.clear).toHaveBeenCalled()
 		})
 	})
+
+	describe('open()', () => {
+		let uri
+		beforeEach(() => {
+			uri = xTerminalInstance.profilesSingleton.generateNewUri()
+			spyOn(atom.workspace, 'open')
+		})
+
+		it('simple', async () => {
+			await xTerminalInstance.open(uri)
+
+			expect(atom.workspace.open).toHaveBeenCalledWith(uri, {})
+		})
+
+		it('target to cwd', async () => {
+			const testPath = '/test/path'
+			spyOn(xTerminalInstance, 'getPath').and.returnValue(testPath)
+			await xTerminalInstance.open(
+				uri,
+				{ target: true },
+			)
+
+			const url = new URL(atom.workspace.open.calls.mostRecent().args[0])
+
+			expect(url.searchParams.get('cwd')).toBe(testPath)
+		})
+	})
 })

src/model.js

@@ -46,6 +46,7 @@ class XTerminalModel {
 		this.uri = this.options.uri
 		const url = new URL(this.uri)
 		this.sessionId = url.host
+		this.uriCwd = url.searchParams.get('cwd')
 		this.profilesSingleton = XTerminalProfilesSingleton.instance
 		this.profile = this.profilesSingleton.createProfileDataFromUri(this.uri)
 		this.terminals_set = this.options.terminals_set
@@ -73,8 +74,8 @@ class XTerminalModel {
 	async initialize () {
 		let cwd
 
-		if (this.options.target) {
-			cwd = this.options.target
+		if (this.uriCwd) {
+			cwd = this.uriCwd
 		} else if (this.profile.projectCwd) {
 			const previousActiveItem = atom.workspace.getActivePaneItem()
 			if (typeof previousActiveItem !== 'undefined' && typeof previousActiveItem.getPath === 'function') {

src/x-terminal.js

@@ -112,13 +112,8 @@ class XTerminalSingleton {
 			// Add opener for terminal emulator item.
 			atom.workspace.addOpener((uri) => {
 				if (uri.startsWith(X_TERMINAL_BASE_URI)) {
-					const { searchParams } = new URL(uri)
-					const target = searchParams.get('target')
-					searchParams.delete('target')
-
 					const item = new XTerminalModel({
 						uri,
-						target,
 						terminals_set: this.terminals_set,
 					})
 					return item
@@ -441,18 +436,16 @@ class XTerminalSingleton {
 
 	async open (uri, options = {}) {
 		const url = new URL(uri)
-		let relaunchTerminalOnStartup = url.searchParams.get('relaunchTerminalOnStartup')
-		if (relaunchTerminalOnStartup === null) {
-			relaunchTerminalOnStartup = this.profilesSingleton.getBaseProfile().relaunchTerminalOnStartup
-			if (!relaunchTerminalOnStartup) {
+		if (url.searchParams.get('relaunchTerminalOnStartup') === null) {
+			if (!this.profilesSingleton.getBaseProfile().relaunchTerminalOnStartup) {
 				url.searchParams.set('relaunchTerminalOnStartup', false)
 			}
 		}
 
 		if (options.target) {
 			const target = this.getPath(options.target)
 			if (target) {
-				url.searchParams.set('target', target)
+				url.searchParams.set('cwd', target)
 			}
 		}