Merge branch 'master' into buildbox-service

Conflicts:
	app/models/project.rb

3 files changed, 6 insertions, 6 deletions

diff --git a/features/steps/snippets/discover.rb b/features/steps/snippets/discover.rb
index da73dfc68be..42bccafcc84 100644
--- a/features/steps/snippets/discover.rb
+++ b/features/steps/snippets/discover.rb
@@ -1,4 +1,4 @@
-class Spinach::Features::DiscoverSnippets < Spinach::FeatureSteps
+class Spinach::Features::SnippetsDiscover < Spinach::FeatureSteps
   include SharedAuthentication
   include SharedPaths
   include SharedSnippet
diff --git a/features/steps/snippets/snippets.rb b/features/steps/snippets/snippets.rb
index e8154c8ce57..de936db85ee 100644
--- a/features/steps/snippets/snippets.rb
+++ b/features/steps/snippets/snippets.rb
@@ -1,4 +1,4 @@
-class Spinach::Features::SnippetsFeature < Spinach::FeatureSteps
+class Spinach::Features::Snippets < Spinach::FeatureSteps
   include SharedAuthentication
   include SharedPaths
   include SharedProject
@@ -46,7 +46,7 @@ class Spinach::Features::SnippetsFeature < Spinach::FeatureSteps
   end
 
   step 'I uncheck "Private" checkbox' do
-    choose "Public"
+    choose "Internal"
     click_button "Save"
   end
 
diff --git a/features/steps/snippets/user.rb b/features/steps/snippets/user.rb
index 71a1952926f..c41bc436142 100644
--- a/features/steps/snippets/user.rb
+++ b/features/steps/snippets/user.rb
@@ -1,4 +1,4 @@
-class Spinach::Features::UserSnippets < Spinach::FeatureSteps
+class Spinach::Features::SnippetsUser < Spinach::FeatureSteps
   include SharedAuthentication
   include SharedPaths
   include SharedSnippet
@@ -23,9 +23,9 @@ class Spinach::Features::UserSnippets < Spinach::FeatureSteps
     page.should_not have_content "Personal snippet private"
   end
 
-  step 'I click "Public" filter' do
+  step 'I click "Internal" filter' do
     within('.nav-stacked') do
-      click_link "Public"
+      click_link "Internal"
     end
   end