summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-11-02 17:58:32 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-11-02 17:58:32 +0000
commit5782217bfce973b0a654e32b6318cb82d0b4e066 (patch)
treeee676015e1ee82983597c74e6c7065ebd03afee0 /spec
parenta9f02300c885df3b7f7cad6d79e161b9547e8723 (diff)
parent1b8d324762787805fabee72d585ac40e244af4d7 (diff)
downloadgitlab-ce-5782217bfce973b0a654e32b6318cb82d0b4e066.tar.gz
Merge branch 'api_file_touched_at' into 'master'
Add ability to fetch the commit ID of the last commit that actually touched a file https://dev.gitlab.org/gitlab/gitlabhq/issues/2564 See merge request !1718
Diffstat (limited to 'spec')
-rw-r--r--spec/requests/api/files_spec.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/requests/api/files_spec.rb b/spec/requests/api/files_spec.rb
index 042e6352567..8efa09f75fd 100644
--- a/spec/requests/api/files_spec.rb
+++ b/spec/requests/api/files_spec.rb
@@ -19,6 +19,7 @@ describe API::API, api: true do
expect(response.status).to eq(200)
expect(json_response['file_path']).to eq(file_path)
expect(json_response['file_name']).to eq('popen.rb')
+ expect(json_response['last_commit_id']).to eq('570e7b2abdd848b95f2f578043fc23bd6f6fd24d')
expect(Base64.decode64(json_response['content']).lines.first).to eq("require 'fileutils'\n")
end