diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-02-02 21:30:11 -0800 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-02-03 09:10:56 -0800 |
| commit | b9d9ac82a9d650b659866ea26dcb4e7987f10381 (patch) | |
| tree | a217436ecda22416b0c45d771ae89109738bfc5f /spec/controllers/commit_controller_spec.rb | |
| parent | 7bf203685210a7484c8deb03d7275e482656e2b3 (diff) | |
| download | gitlab-ce-b9d9ac82a9d650b659866ea26dcb4e7987f10381.tar.gz | |
Commit page: async load branches info
Conflicts:
config/routes.rb
Diffstat (limited to 'spec/controllers/commit_controller_spec.rb')
| -rw-r--r-- | spec/controllers/commit_controller_spec.rb | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/spec/controllers/commit_controller_spec.rb b/spec/controllers/commit_controller_spec.rb index f5822157ea4..cd8b46d7672 100644 --- a/spec/controllers/commit_controller_spec.rb +++ b/spec/controllers/commit_controller_spec.rb @@ -70,4 +70,13 @@ describe Projects::CommitController do end end end + + describe "#branches" do + it "contains branch and tags information" do + get :branches, project_id: project.to_param, id: commit.id + + expect(assigns(:branches)).to include("master", "feature_conflict") + expect(assigns(:tags)).to include("v1.1.0") + end + end end |