Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix test for PR #8046 #8059

Closed
wants to merge 2 commits into from

Conversation

@guillep2k
Copy link
Member

commented Sep 2, 2019

PR #8046 causes integration tests to fail:

pull_create_test.go:103:
                Error Trace:    pull_create_test.go:103
                                                        git_helper_for_declarative_test.go:77
                                                        pull_create_test.go:75
                Error:          Not equal:
                                expected: "<i>XSS PR</i>"
                                actual  : "<strike>&lt;i&gt;XSS PR&lt;/i&gt;</strike>"

                                Diff:
                                --- Expected
                                +++ Actual
                                @@ -1 +1 @@
                                -&lt;i&gt;XSS PR&lt;/i&gt;
                                +<strike>&lt;i&gt;XSS PR&lt;/i&gt;</strike>
                Test:           TestPullCreate_TitleEscape
FAIL

This PR fixes that.

@GiteaBot GiteaBot added the lgtm/need 1 label Sep 2, 2019

@techknowlogick techknowlogick added this to the 1.10.0 milestone Sep 2, 2019

guillep2k added a commit to guillep2k/gitea that referenced this pull request Sep 2, 2019
@guillep2k

This comment has been minimized.

Copy link
Member Author

commented Sep 2, 2019

Note: this PR will still fail CI because of the vendor problem. See #8057.

@guillep2k guillep2k referenced this pull request Sep 2, 2019
techknowlogick added a commit that referenced this pull request Sep 2, 2019
Make CI work (#8057)
* Use export GOPROXY=https://goproxy.cn before build

* Add go version to generate command

* Reproduced the entire build procedure - see notes

I've used:

sudo go clean -i -r -cache -testcache -modcache
make clean
make generate
make golangci-lint
make revive
make swagger-check
make swagger-validate
make test-vendor            <--- this now fails
make vendor                 <--- this now produced changes
git commit -a               <--- this commit

* Add fix from #8059 to complete CI tests
@guillep2k

This comment has been minimized.

Copy link
Member Author

commented Sep 2, 2019

Closing because this was included in #8057

@guillep2k guillep2k closed this Sep 2, 2019

@guillep2k guillep2k deleted the guillep2k:fix-8046-test branch Sep 2, 2019

@codecov-io

This comment has been minimized.

Copy link

commented Sep 2, 2019

Codecov Report

Merging #8059 into master will decrease coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #8059      +/-   ##
==========================================
- Coverage   41.59%   41.57%   -0.02%     
==========================================
  Files         480      480              
  Lines       64144    64144              
==========================================
- Hits        26678    26667      -11     
- Misses      34009    34018       +9     
- Partials     3457     3459       +2
Impacted Files Coverage Δ
modules/avatar/avatar.go 48% <0%> (-6%) ⬇️
models/repo_indexer.go 64.63% <0%> (-2.04%) ⬇️
models/gpg_key.go 55.83% <0%> (-0.84%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 765be70...eeedc1b. Read the comment docs.

@lunny lunny removed this from the 1.10.0 milestone Sep 3, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
5 participants
You can’t perform that action at this time.