commit_controller_spec.rb 9.4 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
        expect(diff_splits.length).to be <= 2
      end
    end

    describe "as patch" do
      include_examples "export as", :patch
      let(:format) { :patch }
105
      let(:commit2) { project.commit('498214de67004b1da3d820901307bed2a68a8ef6') }
S
Sean McGivern 已提交
106

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

110
        expect(response.body).to start_with("From #{commit2.id}")
S
Sean McGivern 已提交
111 112
      end

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

        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 已提交
137
  describe "GET branches" do
S
Sean McGivern 已提交
138
    it "contains branch and tags information" do
139 140
      commit = project.commit('5937ac0a7beb003549fc5fd26fc247adbce4a52e')

S
Sean McGivern 已提交
141
      get(:branches,
142 143
          namespace_id: project.namespace.to_param,
          project_id: project.to_param,
S
Sean McGivern 已提交
144
          id: commit.id)
145

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

S
Sean McGivern 已提交
151
  describe 'POST revert' do
S
Sean McGivern 已提交
152
    context 'when target branch is not provided' do
153
      it 'renders the 404 page' do
S
Sean McGivern 已提交
154 155 156 157 158 159 160 161 162 163 164
        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
165
      it 'redirects to the commits page' do
S
Sean McGivern 已提交
166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185
        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

186
      it 'redirects to the commit page' do
S
Sean McGivern 已提交
187 188 189 190 191 192 193 194 195 196 197 198 199
        # 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 已提交
200
  describe 'POST cherry_pick' do
S
Sean McGivern 已提交
201
    context 'when target branch is not provided' do
202
      it 'renders the 404 page' do
S
Sean McGivern 已提交
203 204 205 206 207 208 209 210 211 212 213
        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
214
      it 'redirects to the commits page' do
S
Sean McGivern 已提交
215 216 217 218 219 220 221 222 223
        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
224 225
    end

S
Sean McGivern 已提交
226 227 228 229 230 231 232 233 234
    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

235
      it 'redirects to the commit page' do
S
Sean McGivern 已提交
236 237 238 239 240 241 242 243 244 245 246 247 248
        # 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 已提交
249
  describe 'GET diff_for_path' do
S
Sean McGivern 已提交
250 251
    def diff_for_path(extra_params = {})
      params = {
252
        namespace_id: project.namespace.to_param,
S
Sean McGivern 已提交
253 254 255 256 257 258 259
        project_id: project.to_param
      }

      get :diff_for_path, params.merge(extra_params)
    end

    let(:existing_path) { '.gitmodules' }
260
    let(:commit2) { project.commit('5937ac0a7beb003549fc5fd26fc247adbce4a52e') }
S
Sean McGivern 已提交
261 262 263 264 265

    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
266
            diff_for_path(id: commit2.id, old_path: existing_path, new_path: existing_path)
S
Sean McGivern 已提交
267 268 269

            expect(assigns(:diff_notes_disabled)).to be_falsey
            expect(assigns(:comments_target)).to eq(noteable_type: 'Commit',
270
                                                    commit_id: commit2.id)
S
Sean McGivern 已提交
271 272 273
          end

          it 'only renders the diffs for the path given' do
274 275 276
            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 已提交
277 278
            end

279
            diff_for_path(id: commit2.id, old_path: existing_path, new_path: existing_path)
S
Sean McGivern 已提交
280 281 282 283
          end
        end

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

          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
295
          diff_for_path(id: commit.id, old_path: existing_path, new_path: existing_path)
S
Sean McGivern 已提交
296 297 298 299 300 301 302 303 304
        end

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

    context 'when the commit does not exist' do
305
      before { diff_for_path(id: commit.id.succ, old_path: existing_path, new_path: existing_path) }
S
Sean McGivern 已提交
306 307 308 309

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