Commit ece44315 authored by Aleksandr Soborov's avatar Aleksandr Soborov Committed by Dan Davison

Unquarantine Secure Licence Compliance MR test

parent a36d844f
...@@ -4,5 +4,21 @@ ...@@ -4,5 +4,21 @@
"count": 1, "count": 1,
"name": "WTFPL" "name": "WTFPL"
} }
],
"dependencies": [
{
"license": {
"name": "WTFPL",
"url": "http://www.wtfpl.net/"
},
"dependency": {
"name": "wtfpl_init",
"url": "https://rubygems.org/gems/wtfpl_init",
"description": "Download WTFPL license file and rename to LICENSE.md or something",
"paths": [
"."
]
}
}
] ]
} }
...@@ -49,11 +49,13 @@ module QA ...@@ -49,11 +49,13 @@ module QA
def approve_license(name) def approve_license(name)
click_license(name) click_license(name)
click_element(:approve_license_button) click_element(:approve_license_button)
wait_for_animated_element(:license_management_modal)
end end
def blacklist_license(name) def blacklist_license(name)
click_license(name) click_license(name)
click_element(:blacklist_license_button) click_element(:blacklist_license_button)
wait_for_animated_element(:license_management_modal)
end end
end end
end end
......
...@@ -3,8 +3,7 @@ ...@@ -3,8 +3,7 @@
require 'pathname' require 'pathname'
module QA module QA
# https://gitlab.com/gitlab-org/gitlab/issues/36696 context 'Secure', :docker do
context 'Secure', :docker, :quarantine do
describe 'License merge request widget' do describe 'License merge request widget' do
let(:approved_license_name) { "MIT" } let(:approved_license_name) { "MIT" }
let(:blacklisted_license_name) { "Zlib" } let(:blacklisted_license_name) { "Zlib" }
...@@ -62,6 +61,50 @@ module QA ...@@ -62,6 +61,50 @@ module QA
"count": 1, "count": 1,
"name": "Zlib" "name": "Zlib"
} }
],
"dependencies": [
{
"license": {
"name": "MIT",
"url": "http://opensource.org/licenses/mit-license"
},
"dependency": {
"name": "actioncable",
"url": "http://rubyonrails.org",
"description": "WebSocket framework for Rails.",
"paths": [
"."
]
}
},
{
"license": {
"name": "WTFPL",
"url": "http://www.wtfpl.net/"
},
"dependency": {
"name": "wtfpl_init",
"url": "https://rubygems.org/gems/wtfpl_init",
"description": "Download WTFPL license file and rename to LICENSE.md or something",
"paths": [
"."
]
}
},
{
"license": {
"name": "Zlib",
"url": "https://www.zlib.net/"
},
"dependency": {
"name": "zlib",
"url": "https://www.zlib.net/",
"description": "Ruby interface for the zlib compression/decompression library",
"paths": [
"."
]
}
}
] ]
} }
FILE_UPDATE FILE_UPDATE
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment