Removed branding from default page, fixed tests (MLH#11)

CovHackSoc · May 31, 2017 · 486bf4a · 486bf4a
1 parent 434a0cb
commit 486bf4a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/no_light_sinatra.rb b/no_light_sinatra.rb
@@ -10,7 +10,7 @@
 end
 
 class NoLightSinatra < Sinatra::Base
-  # use Airbrake::Rack::Middleware 
+  use Airbrake::Rack::Middleware unless ENV['RACK_ENV'] == 'test'
   set public_folder: 'public', static: true
 
   configure do
@@ -56,7 +56,7 @@ class NoLightSinatra < Sinatra::Base
     show_editor(DEFAULT_BRANDING)
   end
 
-  get '/:hackathon/:branding' do
+  get '/:hackathon/:branding?' do
     show_editor(params[:branding])
   end
 

diff --git a/spec/visitor_can_visit_branded_editor_spec.rb b/spec/visitor_can_visit_branded_editor_spec.rb
@@ -8,6 +8,14 @@ def app
 describe NoLightSinatra do
 
   it 'loads the default editor' do
+    visit_branded_editor(nil)
+
+    page.find_classes('body.editor').wont_include       :dell
+    page.find('#submission_html')["placeholder"].must_equal 'Enter your code here ...'
+    page.find('#submit').text.must_equal                    '!light'
+  end
+
+  it 'loads the dell branded editor' do
     visit_branded_editor(:dell)
 
     page.find_classes('body.editor').must_include           :dell