Skip to content

Commit 3d5c76d

Browse files
committed
fix
1 parent ec977c5 commit 3d5c76d

File tree

1 file changed

+11
-14
lines changed

1 file changed

+11
-14
lines changed

test/functional/keys_controller_test.rb

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

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

106
def setup
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'
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
1514
end
16-
1715
def test_index
1816
@request.session[:user_id] = 2
1917
get :index, project_id: 1
@@ -154,9 +152,8 @@ def test_show
154152
end
155153

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

162159
def test_unpriv_show

0 commit comments

Comments
 (0)