diff options
author | Robert Speicher <rspeicher@gmail.com> | 2016-02-18 21:50:49 -0500 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-02-18 21:50:49 -0500 |
commit | dfca5bfa47fa3adcdd8f80ebe92905d1e533b842 (patch) | |
tree | 61542e0fddc6bcb702404e962b6e615bc6f84f87 /spec/controllers/projects | |
parent | ea4d2741a2b574407b0bd387ccd6a8202c014fc5 (diff) | |
download | gitlab-ce-dfca5bfa47fa3adcdd8f80ebe92905d1e533b842.tar.gz |
Move a few controller specs to their correct locationsrs-move-controller-specs
Diffstat (limited to 'spec/controllers/projects')
-rw-r--r-- | spec/controllers/projects/blame_controller_spec.rb | 29 | ||||
-rw-r--r-- | spec/controllers/projects/branches_controller_spec.rb | 104 | ||||
-rw-r--r-- | spec/controllers/projects/commits_controller_spec.rb | 25 |
3 files changed, 158 insertions, 0 deletions
diff --git a/spec/controllers/projects/blame_controller_spec.rb b/spec/controllers/projects/blame_controller_spec.rb new file mode 100644 index 00000000000..25f06299a29 --- /dev/null +++ b/spec/controllers/projects/blame_controller_spec.rb @@ -0,0 +1,29 @@ +require 'spec_helper' + +describe Projects::BlameController do + let(:project) { create(:project) } + let(:user) { create(:user) } + + before do + sign_in(user) + + project.team << [user, :master] + controller.instance_variable_set(:@project, project) + end + + describe "GET show" do + render_views + + before do + get(:show, + namespace_id: project.namespace.to_param, + project_id: project.to_param, + id: id) + end + + context "valid file" do + let(:id) { 'master/files/ruby/popen.rb' } + it { is_expected.to respond_with(:success) } + end + end +end diff --git a/spec/controllers/projects/branches_controller_spec.rb b/spec/controllers/projects/branches_controller_spec.rb new file mode 100644 index 00000000000..8e06d4bdc77 --- /dev/null +++ b/spec/controllers/projects/branches_controller_spec.rb @@ -0,0 +1,104 @@ +require 'spec_helper' + +describe Projects::BranchesController do + let(:project) { create(:project) } + let(:user) { create(:user) } + + before do + sign_in(user) + + project.team << [user, :master] + + allow(project).to receive(:branches).and_return(['master', 'foo/bar/baz']) + allow(project).to receive(:tags).and_return(['v1.0.0', 'v2.0.0']) + controller.instance_variable_set(:@project, project) + end + + describe "POST create" do + render_views + + before do + post :create, + namespace_id: project.namespace.to_param, + project_id: project.to_param, + branch_name: branch, + ref: ref + end + + context "valid branch name, valid source" do + let(:branch) { "merge_branch" } + let(:ref) { "master" } + it 'redirects' do + expect(subject). + to redirect_to("/#{project.path_with_namespace}/tree/merge_branch") + end + end + + context "invalid branch name, valid ref" do + let(:branch) { "<script>alert('merge');</script>" } + let(:ref) { "master" } + it 'redirects' do + expect(subject). + to redirect_to("/#{project.path_with_namespace}/tree/alert('merge');") + end + end + + context "valid branch name, invalid ref" do + let(:branch) { "merge_branch" } + let(:ref) { "<script>alert('ref');</script>" } + it { is_expected.to render_template('new') } + end + + context "invalid branch name, invalid ref" do + let(:branch) { "<script>alert('merge');</script>" } + let(:ref) { "<script>alert('ref');</script>" } + it { is_expected.to render_template('new') } + end + + context "valid branch name with encoded slashes" do + let(:branch) { "feature%2Ftest" } + let(:ref) { "<script>alert('ref');</script>" } + it { is_expected.to render_template('new') } + it { project.repository.branch_names.include?('feature/test')} + end + end + + describe "POST destroy" do + render_views + + before do + post :destroy, + format: :js, + id: branch, + namespace_id: project.namespace.to_param, + project_id: project.to_param + end + + context "valid branch name, valid source" do + let(:branch) { "feature" } + + it { expect(response.status).to eq(200) } + it { expect(subject).to render_template('destroy') } + end + + context "valid branch name with unencoded slashes" do + let(:branch) { "improve/awesome" } + + it { expect(response.status).to eq(200) } + it { expect(subject).to render_template('destroy') } + end + + context "valid branch name with encoded slashes" do + let(:branch) { "improve%2Fawesome" } + + it { expect(response.status).to eq(200) } + it { expect(subject).to render_template('destroy') } + end + context "invalid branch name, valid ref" do + let(:branch) { "no-branch" } + + it { expect(response.status).to eq(404) } + it { expect(subject).to render_template('destroy') } + end + end +end diff --git a/spec/controllers/projects/commits_controller_spec.rb b/spec/controllers/projects/commits_controller_spec.rb new file mode 100644 index 00000000000..7d8089c4bc6 --- /dev/null +++ b/spec/controllers/projects/commits_controller_spec.rb @@ -0,0 +1,25 @@ +require 'spec_helper' + +describe Projects::CommitsController do + let(:project) { create(:project) } + let(:user) { create(:user) } + + before do + sign_in(user) + project.team << [user, :master] + end + + describe "GET show" do + context "as atom feed" do + it "should render as atom" do + get(:show, + namespace_id: project.namespace.to_param, + project_id: project.to_param, + id: "master", + format: "atom") + expect(response).to be_success + expect(response.content_type).to eq('application/atom+xml') + end + end + end +end |