瀏覽代碼

Fix tests after sync with master

Shane Kilkelly 8 年之前
父節點
當前提交
a8222f2e31

+ 4 - 4
services/web/test/acceptance/coffee/LinkedFilesTests.coffee

@@ -369,7 +369,7 @@ describe "LinkedFiles", ->
 						cb(error)
 						cb(error)
 			], done
 			], done
 
 
-		it 'should import the output.pdf file from the source project', (done) ->
+		it 'should import the project.pdf file from the source project', (done) ->
 			@owner.request.post {
 			@owner.request.post {
 				url: "/project/#{@project_one_id}/linked_file",
 				url: "/project/#{@project_one_id}/linked_file",
 				json:
 				json:
@@ -378,7 +378,7 @@ describe "LinkedFiles", ->
 					provider: 'project_output_file',
 					provider: 'project_output_file',
 					data:
 					data:
 						source_project_id: @project_two_id,
 						source_project_id: @project_two_id,
-						source_output_file_path: "output.pdf",
+						source_output_file_path: "project.pdf",
 						build_id: '1234-abcd'
 						build_id: '1234-abcd'
 			}, (error, response, body) =>
 			}, (error, response, body) =>
 				new_file_id = body.new_file_id
 				new_file_id = body.new_file_id
@@ -391,7 +391,7 @@ describe "LinkedFiles", ->
 					expect(firstFile.linkedFileData).to.deep.equal {
 					expect(firstFile.linkedFileData).to.deep.equal {
 						provider: 'project_output_file',
 						provider: 'project_output_file',
 						source_project_id: @project_two_id,
 						source_project_id: @project_two_id,
-						source_output_file_path: "output.pdf",
+						source_output_file_path: "project.pdf",
 						build_id: '1234-abcd'
 						build_id: '1234-abcd'
 					}
 					}
 					expect(firstFile.name).to.equal('test.pdf')
 					expect(firstFile.name).to.equal('test.pdf')
@@ -428,7 +428,7 @@ describe "LinkedFiles", ->
 							linkedFileData: {
 							linkedFileData: {
 								provider: "project_output_file",
 								provider: "project_output_file",
 								v1_source_doc_id: 9999999,  # We won't find this id in the database
 								v1_source_doc_id: 9999999,  # We won't find this id in the database
-								source_output_file_path: "output.pdf",
+								source_output_file_path: "project.pdf",
 								build_id: '123'
 								build_id: '123'
 							},
 							},
 							_id: "abcdef",
 							_id: "abcdef",

+ 7 - 19
services/web/test/acceptance/coffee/helpers/MockClsiApi.coffee

@@ -4,7 +4,8 @@ app = express()
 
 
 module.exports = MockClsiApi =
 module.exports = MockClsiApi =
 	run: () ->
 	run: () ->
-		app.post "/project/:project_id/compile", (req, res, next) =>
+
+		compile = (req, res, next) =>
 			res.status(200).send {
 			res.status(200).send {
 				compile:
 				compile:
 					status: 'success'
 					status: 'success'
@@ -22,6 +23,9 @@ module.exports = MockClsiApi =
 					]
 					]
 			}
 			}
 
 
+		app.post "/project/:project_id/compile", compile
+		app.post "/project/:project_id/user/:user_id/compile", compile
+
 		app.get "/project/:project_id/build/:build_id/output/*", (req, res, next) ->
 		app.get "/project/:project_id/build/:build_id/output/*", (req, res, next) ->
 			filename = req.params[0]
 			filename = req.params[0]
 			if filename == 'project.pdf'
 			if filename == 'project.pdf'
@@ -31,27 +35,11 @@ module.exports = MockClsiApi =
 			else
 			else
 				res.sendStatus(404)
 				res.sendStatus(404)
 
 
-		app.post "/project/:project_id/compile", (req, res, next) =>
-			res.json {
-				compile:
-					status: 'success'
-					outputFiles: [{path: 'output.pdf', build: 'abcd', url: 'http://example.com'}]
-			}
-		app.post "/project/:project_id/user/:user_id/compile", (req, res, next) =>
-			res.json {
-				compile:
-					status: 'success'
-					outputFiles: [{path: 'output.pdf', build: 'abcd', url: 'http://example.com'}]
-			}
-
-		app.get "/project/:project_id/status", (req, res, next) =>
-			res.status(200).send()
-
 		app.get "/project/:project_id/user/:user_id/build/:build_id/output/:output_path", (req, res, next) =>
 		app.get "/project/:project_id/user/:user_id/build/:build_id/output/:output_path", (req, res, next) =>
 			res.status(200).send("hello")
 			res.status(200).send("hello")
 
 
-		app.all "*", (req, res, next) =>
-			next()
+		app.get "/project/:project_id/status", (req, res, next) =>
+			res.status(200).send()
 
 
 		app.listen 3013, (error) ->
 		app.listen 3013, (error) ->
 			throw error if error?
 			throw error if error?