commit_controller_spec.rb 9.2 KB
Newer Older
S
Sean McGivern 已提交
1
require 'spec_helper'
2 3

describe Projects::CommitController do
S
Sean McGivern 已提交
4 5 6 7 8 9 10 11 12 13 14
  let(:project) { create(:project) }
  let(:user)    { create(:user) }
  let(:commit)  { project.commit("master") }
  let(:master_pickable_sha) { '7d3b0f7cff5f37573aea97cebfd5692ea1689924' }
  let(:master_pickable_commit)  { project.commit(master_pickable_sha) }

  before do
    sign_in(user)
    project.team << [user, :master]
  end

S
Sean McGivern 已提交
15
  describe 'GET show' do
16 17
    render_views

S
Sean McGivern 已提交
18 19 20 21 22 23 24 25 26
    def go(extra_params = {})
      params = {
        namespace_id: project.namespace.to_param,
        project_id: project.to_param
      }

      get :show, params.merge(extra_params)
    end

27 28
    context 'with valid id' do
      it 'responds with 200' do
S
Sean McGivern 已提交
29
        go(id: commit.id)
30 31 32 33 34 35 36

        expect(response).to be_ok
      end
    end

    context 'with invalid id' do
      it 'responds with 404' do
S
Sean McGivern 已提交
37
        go(id: commit.id.reverse)
38 39 40 41 42

        expect(response).to be_not_found
      end
    end

43
    it 'handles binary files' do
S
Sean McGivern 已提交
44 45 46 47 48 49
      go(id: TestEnv::BRANCH_SHA['binary-encoding'], format: 'html')

      expect(response).to be_success
    end

    shared_examples "export as" do |format|
50
      it "does generally work" do
S
Sean McGivern 已提交
51 52 53 54 55
        go(id: commit.id, format: format)

        expect(response).to be_success
      end

56
      it "generates it" do
S
Sean McGivern 已提交
57 58 59 60 61
        expect_any_instance_of(Commit).to receive(:"to_#{format}")

        go(id: commit.id, format: format)
      end

62
      it "renders it" do
S
Sean McGivern 已提交
63 64 65 66 67
        go(id: commit.id, format: format)

        expect(response.body).to eq(commit.send(:"to_#{format}"))
      end

68
      it "does not escape Html" do
S
Sean McGivern 已提交
69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85
        allow_any_instance_of(Commit).to receive(:"to_#{format}").
          and_return('HTML entities &<>" ')

        go(id: commit.id, format: format)

        expect(response.body).not_to include('&amp;')
        expect(response.body).not_to include('&gt;')
        expect(response.body).not_to include('&lt;')
        expect(response.body).not_to include('&quot;')
      end
    end

    describe "as diff" do
      include_examples "export as", :diff
      let(:format) { :diff }

      it "should really only be a git diff" do
86
        go(id: '66eceea0db202bb39c4e445e8ca28689645366c5', format: format)
S
Sean McGivern 已提交
87 88 89 90

        expect(response.body).to start_with("diff --git")
      end

91
      it "is only be a git diff without whitespace changes" do
S
Sean McGivern 已提交
92 93 94
        go(id: '66eceea0db202bb39c4e445e8ca28689645366c5', format: format, w: 1)

        expect(response.body).to start_with("diff --git")
95 96 97

        # without whitespace option, there are more than 2 diff_splits for other formats
        diff_splits = assigns(:diffs).diff_files.first.diff.diff.split("\n")
S
Sean McGivern 已提交
98 99 100 101 102 103 104 105
        expect(diff_splits.length).to be <= 2
      end
    end

    describe "as patch" do
      include_examples "export as", :patch
      let(:format) { :patch }

106
      it "is a git email patch" do
S
Sean McGivern 已提交
107 108 109 110 111
        go(id: commit.id, format: format)

        expect(response.body).to start_with("From #{commit.id}")
      end

112
      it "contains a git diff" do
S
Sean McGivern 已提交
113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135
        go(id: commit.id, format: format)

        expect(response.body).to match(/^diff --git/)
      end
    end

    context 'commit that removes a submodule' do
      render_views

      let(:fork_project) { create(:forked_project_with_submodules, visibility_level: 20) }
      let(:commit) { fork_project.commit('remove-submodule') }

      it 'renders it' do
        get(:show,
            namespace_id: fork_project.namespace.to_param,
            project_id: fork_project.to_param,
            id: commit.id)

        expect(response).to be_success
      end
    end
  end

S
Sean McGivern 已提交
136
  describe "GET branches" do
S
Sean McGivern 已提交
137 138
    it "contains branch and tags information" do
      get(:branches,
139 140
          namespace_id: project.namespace.to_param,
          project_id: project.to_param,
S
Sean McGivern 已提交
141
          id: commit.id)
142

S
Sean McGivern 已提交
143 144 145 146 147
      expect(assigns(:branches)).to include("master", "feature_conflict")
      expect(assigns(:tags)).to include("v1.1.0")
    end
  end

S
Sean McGivern 已提交
148
  describe 'POST revert' do
S
Sean McGivern 已提交
149
    context 'when target branch is not provided' do
150
      it 'renders the 404 page' do
S
Sean McGivern 已提交
151 152 153 154 155 156 157 158 159 160 161
        post(:revert,
            namespace_id: project.namespace.to_param,
            project_id: project.to_param,
            id: commit.id)

        expect(response).not_to be_success
        expect(response).to have_http_status(404)
      end
    end

    context 'when the revert was successful' do
162
      it 'redirects to the commits page' do
S
Sean McGivern 已提交
163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182
        post(:revert,
            namespace_id: project.namespace.to_param,
            project_id: project.to_param,
            target_branch: 'master',
            id: commit.id)

        expect(response).to redirect_to namespace_project_commits_path(project.namespace, project, 'master')
        expect(flash[:notice]).to eq('The commit has been successfully reverted.')
      end
    end

    context 'when the revert failed' do
      before do
        post(:revert,
            namespace_id: project.namespace.to_param,
            project_id: project.to_param,
            target_branch: 'master',
            id: commit.id)
      end

183
      it 'redirects to the commit page' do
S
Sean McGivern 已提交
184 185 186 187 188 189 190 191 192 193 194 195 196
        # Reverting a commit that has been already reverted.
        post(:revert,
            namespace_id: project.namespace.to_param,
            project_id: project.to_param,
            target_branch: 'master',
            id: commit.id)

        expect(response).to redirect_to namespace_project_commit_path(project.namespace, project, commit.id)
        expect(flash[:alert]).to match('Sorry, we cannot revert this commit automatically.')
      end
    end
  end

S
Sean McGivern 已提交
197
  describe 'POST cherry_pick' do
S
Sean McGivern 已提交
198
    context 'when target branch is not provided' do
199
      it 'renders the 404 page' do
S
Sean McGivern 已提交
200 201 202 203 204 205 206 207 208 209 210
        post(:cherry_pick,
            namespace_id: project.namespace.to_param,
            project_id: project.to_param,
            id: master_pickable_commit.id)

        expect(response).not_to be_success
        expect(response).to have_http_status(404)
      end
    end

    context 'when the cherry-pick was successful' do
211
      it 'redirects to the commits page' do
S
Sean McGivern 已提交
212 213 214 215 216 217 218 219 220
        post(:cherry_pick,
            namespace_id: project.namespace.to_param,
            project_id: project.to_param,
            target_branch: 'master',
            id: master_pickable_commit.id)

        expect(response).to redirect_to namespace_project_commits_path(project.namespace, project, 'master')
        expect(flash[:notice]).to eq('The commit has been successfully cherry-picked.')
      end
221 222
    end

S
Sean McGivern 已提交
223 224 225 226 227 228 229 230 231
    context 'when the cherry_pick failed' do
      before do
        post(:cherry_pick,
            namespace_id: project.namespace.to_param,
            project_id: project.to_param,
            target_branch: 'master',
            id: master_pickable_commit.id)
      end

232
      it 'redirects to the commit page' do
S
Sean McGivern 已提交
233 234 235 236 237 238 239 240 241 242 243 244 245
        # Cherry-picking a commit that has been already cherry-picked.
        post(:cherry_pick,
            namespace_id: project.namespace.to_param,
            project_id: project.to_param,
            target_branch: 'master',
            id: master_pickable_commit.id)

        expect(response).to redirect_to namespace_project_commit_path(project.namespace, project, master_pickable_commit.id)
        expect(flash[:alert]).to match('Sorry, we cannot cherry-pick this commit automatically.')
      end
    end
  end

S
Sean McGivern 已提交
246
  describe 'GET diff_for_path' do
S
Sean McGivern 已提交
247 248
    def diff_for_path(extra_params = {})
      params = {
249
        namespace_id: project.namespace.to_param,
S
Sean McGivern 已提交
250 251 252 253 254 255 256 257 258 259 260 261
        project_id: project.to_param
      }

      get :diff_for_path, params.merge(extra_params)
    end

    let(:existing_path) { '.gitmodules' }

    context 'when the commit exists' do
      context 'when the user has access to the project' do
        context 'when the path exists in the diff' do
          it 'enables diff notes' do
262
            diff_for_path(id: commit.id, old_path: existing_path, new_path: existing_path)
S
Sean McGivern 已提交
263 264 265 266 267 268 269

            expect(assigns(:diff_notes_disabled)).to be_falsey
            expect(assigns(:comments_target)).to eq(noteable_type: 'Commit',
                                                    commit_id: commit.id)
          end

          it 'only renders the diffs for the path given' do
270 271 272
            expect(controller).to receive(:render_diff_for_path).and_wrap_original do |meth, diffs|
              expect(diffs.diff_files.map(&:new_path)).to contain_exactly(existing_path)
              meth.call(diffs)
S
Sean McGivern 已提交
273 274
            end

275
            diff_for_path(id: commit.id, old_path: existing_path, new_path: existing_path)
S
Sean McGivern 已提交
276 277 278 279
          end
        end

        context 'when the path does not exist in the diff' do
280
          before { diff_for_path(id: commit.id, old_path: existing_path.succ, new_path: existing_path.succ) }
S
Sean McGivern 已提交
281 282 283 284 285 286 287 288 289 290

          it 'returns a 404' do
            expect(response).to have_http_status(404)
          end
        end
      end

      context 'when the user does not have access to the project' do
        before do
          project.team.truncate
291
          diff_for_path(id: commit.id, old_path: existing_path, new_path: existing_path)
S
Sean McGivern 已提交
292 293 294 295 296 297 298 299 300
        end

        it 'returns a 404' do
          expect(response).to have_http_status(404)
        end
      end
    end

    context 'when the commit does not exist' do
301
      before { diff_for_path(id: commit.id.succ, old_path: existing_path, new_path: existing_path) }
S
Sean McGivern 已提交
302 303 304 305

      it 'returns a 404' do
        expect(response).to have_http_status(404)
      end
306 307 308
    end
  end
end