Skip to content

Commit 5e416d8

Browse files
committed
delete functional
1 parent 3d5c76d commit 5e416d8

File tree

3 files changed

+34
-24
lines changed

3 files changed

+34
-24
lines changed

.github/workflows/ci.yml

-1
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,5 @@ jobs:
4747
cd $REDMINE_PATH
4848
export SKIP_COVERAGE=1
4949
bundle exec rake redmine:plugins:test:units NAME=$PLUGIN_NAME RUBYOPT="-W0"
50-
bundle exec rake redmine:plugins:test:functionals NAME=$PLUGIN_NAME RUBYOPT="-W0"
5150
bundle exec rake redmine:plugins:test:integration NAME=$PLUGIN_NAME RUBYOPT="-W0"
5251
bundle exec rake redmine:plugins:migrate NAME=$PLUGIN_NAME VERSION=0
+20-12
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,29 @@
1-
# plugins/vault/test/functional/key_files_controller_test.rb
21
require File.expand_path('../../test_helper', __FILE__)
2+
require 'fileutils'
3+
require 'byebug'
34

4-
class KeyFilesControllerTest < ActionController::TestCase
5-
fixtures :projects, :users, :key_files
5+
class KeyFilesControllerTest < Vault::ControllerTest
6+
fixtures :projects, :users, :roles, :members, :member_roles
7+
plugin_fixtures :keys, :vault_tags, :keys_vault_tags
68

79
def setup
8-
@controller = KeyFilesController.new
9-
@request = ActionController::TestRequest.create
10-
@response = ActionController::TestResponse.create
11-
@project = projects(:one)
12-
@key_file = key_files(:one)
13-
@user = users(:one)
14-
@request.session[:user_id] = @user.id
10+
Role.find(1).add_permission! :view_keys
11+
Role.find(1).add_permission! :edit_keys
12+
Role.find(1).add_permission! :download_keys
13+
Project.find(1).enabled_module_names = [:keys]
14+
Setting.plugin_vault['use_null_encryption'] = 'on'
15+
FileUtils.cp 'plugins/vault/test/fixtures/keyfile.txt', "#{Vault::KEYFILES_DIR}/server.key"
1516
end
1617

1718
def test_download_keyfile
18-
get :download, params: { project_id: @project.id, id: @key_file.id }
19+
@request.session[:user_id] = 2
20+
21+
get :download, project_id: 1, id: 3
22+
1923
assert_response :success
24+
assert_equal 'application/octet-stream', response.content_type
25+
assert_equal "This is file for tests\n", response.body
26+
assert_equal 'attachment; filename="ssh_access"', response.header["Content-Disposition"]
2027
end
21-
end
28+
29+
end

test/functional/keys_controller_test.rb

+14-11
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
11
require File.expand_path('../../test_helper', __FILE__)
2+
require 'fileutils'
3+
require 'set'
4+
require 'byebug'
25

3-
class KeysControllerTest < ActionController::TestCase
4-
fixtures :projects, :users, :keys
6+
class KeysControllerTest < Vault::ControllerTest
7+
fixtures :projects, :users, :roles, :members, :member_roles
8+
plugin_fixtures :keys, :vault_tags, :keys_vault_tags
59

610
def setup
7-
@controller = KeysController.new
8-
@request = ActionController::TestRequest.create
9-
@response = ActionController::TestResponse.create
10-
@project = projects(:one)
11-
@key = keys(:one)
12-
@user = users(:one)
13-
@request.session[:user_id] = @user.id
11+
Role.find(1).add_permission! :view_keys
12+
Role.find(1).add_permission! :edit_keys
13+
Project.find(1).enabled_module_names = [:keys]
14+
Setting.plugin_vault['use_null_encryption'] = 'on'
1415
end
16+
1517
def test_index
1618
@request.session[:user_id] = 2
1719
get :index, project_id: 1
@@ -152,8 +154,9 @@ def test_show
152154
end
153155

154156
def test_crossproject_show
155-
get :show, params: { project_id: @project.id, id: @key.id }
156-
assert_response :success
157+
@request.session[:user_id] = 2
158+
get :show, project_id: 1, id: 2
159+
assert_response :redirect
157160
end
158161

159162
def test_unpriv_show

0 commit comments

Comments
 (0)