Skip to content

Develop#77

Open
ConorSmyth wants to merge 109 commits intomasterfrom
develop
Open

Develop#77
ConorSmyth wants to merge 109 commits intomasterfrom
develop

Conversation

@ConorSmyth
Copy link
Copy Markdown
Collaborator

@ConorSmyth ConorSmyth commented Mar 12, 2018

I think there is a few issues with unit tests and integrations tests on the Go side I am still having a look at it.

I have merged in XAPTC 10.1 and XAPTC 18

angerooney11 and others added 30 commits February 12, 2018 09:43
 into feature/XAPTC-18

# Conflicts:
#	ui-src/src/app/app.module.ts
-Updating Buttons and file selector
…ted-perf-test into feature/XAPTC-18

# Conflicts:
#	uiServices/src/testSuiteServices.go
-added godog test for get all
Comment thread .gitignore
@@ -4,4 +4,6 @@ main
.idea
Copy link
Copy Markdown
Collaborator

@jenny-flynn jenny-flynn Mar 12, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you also add

 config/*.xml
 !config/config.xml
 *.iml
 .idea
 ui/
 automated-perf-test
 uiServices/test/*.xml

CameliaFarcas and others added 9 commits March 12, 2018 15:39
reuse functions
add logging
…ted-perf-test into develop

# Conflicts:
#	config/TestCaseService2.xml
#	config/config2222.xml
#	config/configkkk.xml
#	uiServices/src/configServices.go
#	uiServices/src/homepage.go
#	uiServices/src/testCaseServices.go
#	uiServices/src/testCaseServices_test.go
#	uiServices/test/GodogTestCase.xml
#	uiServices/test/GodogTestCase2.xml
#	uiServices/test/testCase.feature
@ConorSmyth
Copy link
Copy Markdown
Collaborator Author

@CameliaFarcas @jenny-flynn & @AlexeiSuleac when you get a chance can you take a look a take a look at this PR. I am nearly certain that there could be improvements made, If there is technical debt lets create cards for it unless it really quick aka less than 1.5hour. I have everything passing now.

I have merged both XAPTC-18 and XAPTC-10.1 and XAPTC-63 in this branch. These branches are still waiting approval in the PR state to merged into master.

The plan for this branch is to merge this into master and then keep develop branch around as the main development branch and all future branches will be created from this one. When we cut a release or tag we will merge it into master.

Comment thread ui-src/package.json
"dependencies": {
"@angular/animations": "^5.1.3",
"@angular/cdk": "^5.0.3",
"@angular-devkit/core": "^5.0.0",
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this work now with "^5.0.0"?

Comment thread ui-src/package.json
},
"devDependencies": {
"@angular/cli": "1.6.8",
"@angular/cli": "1.6.3",
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why going down a version? Just curious

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@AlexeiSuleac as this was the origanal version we started with. It doesn't really make a difference any way it is only the patch version and should be backward compatible.

Comment thread config/config.xml
@@ -1,47 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you restore this config file?

ResponseContentType string `xml:"responseContentType"`
Headers []Header `xml:"headers>header"`
ResponseValues []ResponseValue `xml:"responseProperties>value"`
PreThinkTime int64 `xml:"preThinkTime"`
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think we need to expose these to be unmarshalled into the XML config/defs files


func postConfigs(rw http.ResponseWriter, req *http.Request) {
configPathDir := req.Header.Get("configPathDir")
rw.Header().Set("Access-Control-Allow-Origin", "*")
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think we could have a return method at the end of each handler that adds this header, the body, and the status code to the request.

request.Header.Set("configPathDir", filePath)
request.Header.Get("configPathDir")
request.Header.Set("path", filePath)
request.Header.Get("path")
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this line can be removed in each place it occurs

XMLName xml.Name `xml:"testCase" json:"testCase"`
XMLName xml.Name `xml:"testCase"`
Name string `xml:",chardata"`
Description string `xml:"description,attr" json:"description"`
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think i remember hearing we didn't want to make this change

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants