Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2017-04-12 11:50:54 +0300
committerLuke "Jared" Bennett <lbennett@gitlab.com>2017-04-12 11:50:54 +0300
commit0453d6d7ae72f0179d02ff5190122a86e304e1bb (patch)
tree7476883462fc6aa2e572b9d274acf2eda8f119f7
parent6d2db33de43f20c314bee558919c1859e6f54d4a (diff)
BE review changes
-rw-r--r--app/models/blob.rb2
-rw-r--r--spec/features/projects/blobs/balsamiq_preview_spec.rb3
2 files changed, 2 insertions, 3 deletions
diff --git a/app/models/blob.rb b/app/models/blob.rb
index 91cf171a688..82333b6f369 100644
--- a/app/models/blob.rb
+++ b/app/models/blob.rb
@@ -63,7 +63,7 @@ class Blob < SimpleDelegator
end
def balsamiq?
- binary? && extname.downcase.delete('.') == 'bmpr'
+ binary? && extension == 'bmpr'
end
def stl?
diff --git a/spec/features/projects/blobs/balsamiq_preview_spec.rb b/spec/features/projects/blobs/balsamiq_preview_spec.rb
index 551d2045744..59475525b81 100644
--- a/spec/features/projects/blobs/balsamiq_preview_spec.rb
+++ b/spec/features/projects/blobs/balsamiq_preview_spec.rb
@@ -7,7 +7,6 @@ feature 'Balsamiq preview', :feature, :js do
let(:project) { create(:project) }
let(:branch) { 'add-balsamiq-file' }
let(:path) { 'files/images/balsamiq.bmpr' }
- let(:file_content) { find('.file-content') }
before do
project.add_master(user)
@@ -16,7 +15,7 @@ feature 'Balsamiq preview', :feature, :js do
end
it 'should show a loading icon' do
- expect(file_content).to have_selector('.loading')
+ expect(find('.file-content')).to have_selector('.loading')
end
it 'should show a viewer container' do