diff options
author | Kamil Trzciński <ayufan@ayufan.eu> | 2015-10-15 14:35:57 +0300 |
---|---|---|
committer | Kamil Trzciński <ayufan@ayufan.eu> | 2015-10-15 14:35:57 +0300 |
commit | daccc54d25a5acfd089e02fd7387ed14f0a3a629 (patch) | |
tree | 23022a603117e114ea608c7fa3e842a615f8faf6 /spec/models/ci/runner_spec.rb | |
parent | 524b3db30ca53449c13cb6bb9a518cfc2c0cacf7 (diff) | |
parent | 9fa209e1d8748b1eb1ef041bb1c40d30914f2815 (diff) |
Merge branch 'builds-view' into 'master'
Added builds view
![Screen_Shot_2015-10-13_at_19.02.48](https://gitlab.com/gitlab-org/gitlab-ce/uploads/95bb3a7d9d603678fdd077558637045d/Screen_Shot_2015-10-13_at_19.02.48.png)
/cc @dzaporozhets @vsizov
See merge request !1593
Diffstat (limited to 'spec/models/ci/runner_spec.rb')
-rw-r--r-- | spec/models/ci/runner_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/models/ci/runner_spec.rb b/spec/models/ci/runner_spec.rb index 536a737a33d..f8a51c29dc2 100644 --- a/spec/models/ci/runner_spec.rb +++ b/spec/models/ci/runner_spec.rb @@ -32,7 +32,7 @@ describe Ci::Runner do end it 'should return the token if the description is an empty string' do - runner = FactoryGirl.build(:ci_runner, description: '') + runner = FactoryGirl.build(:ci_runner, description: '', token: 'token') expect(runner.display_name).to eq runner.token end end |