Skip to content

Commit cca05c1

Browse files
author
root
committed
Fix tests
1 parent dd40500 commit cca05c1

5 files changed

+19
-14
lines changed

Diff for: app/controllers/repository_deployment_credentials_controller.rb

+5
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ def index
1818
end
1919

2020

21+
def show
22+
render_404
23+
end
24+
25+
2126
def new
2227
@credential = @repository.deployment_credentials.new
2328
end

Diff for: spec/controllers/repository_deployment_credentials_controller_spec.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ def success_url
4646
get :show, :repository_id => @repository.id, :id => @credential.id
4747
end
4848

49-
it "renders 406" do
50-
expect(response.status).to eq 406
49+
it "renders 404" do
50+
expect(response.status).to eq 404
5151
end
5252
end
5353

Diff for: spec/controllers/repository_git_config_keys_controller_spec.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ def success_url
3434

3535
describe "GET #show" do
3636
before do
37-
request.session[:user_id] = @user.id
38-
get :show, :repository_id => @repository.id, :id => @git_config_key.id
37+
Setting.rest_api_enabled = 1
38+
get :show, :repository_id => @repository.id, :id => @git_config_key.id, :format => 'json', :key => @user.api_key
3939
end
4040

41-
it "renders 406" do
42-
expect(response.status).to eq 406
41+
it "renders 200" do
42+
expect(response.status).to eq 200
4343
end
4444
end
4545

Diff for: spec/controllers/repository_mirrors_controller_spec.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ def success_url
3434

3535
describe "GET #show" do
3636
before do
37-
request.session[:user_id] = @user.id
38-
get :show, :repository_id => @repository.id, :id => @mirror.id
37+
Setting.rest_api_enabled = 1
38+
get :show, :repository_id => @repository.id, :id => @mirror.id, :format => 'json', :key => @user.api_key
3939
end
4040

41-
it "renders 406" do
42-
expect(response.status).to eq 406
41+
it "renders 200" do
42+
expect(response.status).to eq 200
4343
end
4444
end
4545

Diff for: spec/controllers/repository_post_receive_urls_controller_spec.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ def success_url
3434

3535
describe "GET #show" do
3636
before do
37-
request.session[:user_id] = @user.id
38-
get :show, :repository_id => @repository.id, :id => @post_receive_url.id
37+
Setting.rest_api_enabled = 1
38+
get :show, :repository_id => @repository.id, :id => @post_receive_url.id, :format => 'json', :key => @user.api_key
3939
end
4040

41-
it "renders 406" do
42-
expect(response.status).to eq 406
41+
it "renders 200" do
42+
expect(response.status).to eq 200
4343
end
4444
end
4545

0 commit comments

Comments
 (0)