Merge pull request #3 from LendingHome/revert-2-develop

Revert "develop to master"

apps/staging/lib/schemas/server.ex

@@ -31,10 +31,7 @@ defmodule Staging.Server do
   end
 
   def order_by_name(query) do
-    from s in query, order_by: [
-      fragment("regexp_matches(?, '^\D+')::text[]", s.name),
-      fragment("regexp_matches(?, '\d+$')::int[]", s.name)
-    ]
+    from s in query, order_by: s.name
   end
 
   def archive_all(query) do

apps/staging/spec/staging_bot_spec.exs

@@ -62,21 +62,6 @@ defmodule Staging.BotSpec do
       end
     end
 
-    context "there are servers with numeric suffixes" do
-      before do
-        Factory.insert(:server, %{name: "qa-11", prod_data: false})
-        Factory.insert(:server, %{name: "qa-1", prod_data: false})
-        Factory.insert(:server, %{name: "beta-21", prod_data: false})
-        Factory.insert(:server, %{name: "beta-2", prod_data: false})
-      end
-
-      it "lists the servers alphabetically by name prefix then numerically by index suffix" do
-        Bot.handle_event(%{type: "message", text: "#{@bot_name} list", channel: @channel, user: @message_user.id}, @slack, [])
-        response = string_matching(~r/beta-2.+beta-21.+qa-1.+qa-11/iu)
-        expect(@slack_send).to have_received([response, @channel, @slack])
-      end
-    end
-
     context "some servers are archived" do
       before do
         Factory.insert(:server, %{name: "server-1", archived: false})