diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-05-10 16:41:36 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-05-10 16:41:36 +0000 |
commit | d81794ad4992aa234a8916088616c0faac731e49 (patch) | |
tree | 8769629a000dfd4405f32bceb6950fd0aa9c7ca2 /spec | |
parent | 566ee14516ac54e52c4dfaf40d10bc5f2abc3627 (diff) | |
parent | 00fc9f260706cfd6d6f4261eea24eb3ff455b3e0 (diff) | |
download | gitlab-ce-d81794ad4992aa234a8916088616c0faac731e49.tar.gz |
Merge branch 'dm-async-tree-readme' into 'master'
Load tree readme asynchronously
See merge request !11191
Diffstat (limited to 'spec')
-rw-r--r-- | spec/models/repository_spec.rb | 2 | ||||
-rw-r--r-- | spec/views/projects/tree/show.html.haml_spec.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb index dd6514b3b50..cea8db7a926 100644 --- a/spec/models/repository_spec.rb +++ b/spec/models/repository_spec.rb @@ -1634,7 +1634,7 @@ describe Repository, models: true do context 'with an existing repository' do it 'returns the README' do - expect(repository.readme).to be_an_instance_of(Gitlab::Git::Blob) + expect(repository.readme).to be_an_instance_of(ReadmeBlob) end end end diff --git a/spec/views/projects/tree/show.html.haml_spec.rb b/spec/views/projects/tree/show.html.haml_spec.rb index 900f8d4732f..835a93e620e 100644 --- a/spec/views/projects/tree/show.html.haml_spec.rb +++ b/spec/views/projects/tree/show.html.haml_spec.rb @@ -31,7 +31,7 @@ describe 'projects/tree/show' do it 'displays correctly' do render expect(rendered).to have_css('.js-project-refs-dropdown .dropdown-toggle-text', text: ref) - expect(rendered).to have_css('.readme-holder .file-content', text: ref) + expect(rendered).to have_css('.readme-holder') end end end |