test/integration/app/app/controllers/states_controller.rb in ultrasphinx-1.9 vs test/integration/app/app/controllers/states_controller.rb in ultrasphinx-1.11

@@ -1,53 +1,53 @@
 class StatesController < ApplicationController
   # GET /states
   # GET /states.xml
   def index
-    @states = State.find(:all)
+    @states = Geo::State.find(:all)
 
     respond_to do |format|
       format.html # index.html.erb
       format.xml  { render :xml => @states }
     end
   end
 
   # GET /states/1
   # GET /states/1.xml
   def show
-    @state = State.find(params[:id])
+    @state = Geo::State.find(params[:id])
 
     respond_to do |format|
       format.html # show.html.erb
       format.xml  { render :xml => @state }
     end
   end
 
   # GET /states/new
   # GET /states/new.xml
   def new
-    @state = State.new
+    @state = Geo::State.new
 
     respond_to do |format|
       format.html # new.html.erb
       format.xml  { render :xml => @state }
     end
   end
 
   # GET /states/1/edit
   def edit
-    @state = State.find(params[:id])
+    @state = Geo::State.find(params[:id])
   end
 
   # POST /states
   # POST /states.xml
   def create
-    @state = State.new(params[:state])
+    @state = Geo::State.new(params[:state])
 
     respond_to do |format|
       if @state.save
         flash[:notice] = 'State was successfully created.'
-        format.html { redirect_to(@state) }
+        format.html { redirect_to(state_path(@state)) }
         format.xml  { render :xml => @state, :status => :created, :location => @state }
       else
         format.html { render :action => "new" }
         format.xml  { render :xml => @state.errors, :status => :unprocessable_entity }
       end
@@ -55,16 +55,16 @@
   end
 
   # PUT /states/1
   # PUT /states/1.xml
   def update
-    @state = State.find(params[:id])
+    @state = Geo::State.find(params[:id])
 
     respond_to do |format|
       if @state.update_attributes(params[:state])
         flash[:notice] = 'State was successfully updated.'
-        format.html { redirect_to(@state) }
+        format.html { redirect_to(state_path(@state)) }
         format.xml  { head :ok }
       else
         format.html { render :action => "edit" }
         format.xml  { render :xml => @state.errors, :status => :unprocessable_entity }
       end
@@ -72,10 +72,10 @@
   end
 
   # DELETE /states/1
   # DELETE /states/1.xml
   def destroy
-    @state = State.find(params[:id])
+    @state = Geo::State.find(params[:id])
     @state.destroy
 
     respond_to do |format|
       format.html { redirect_to(states_url) }
       format.xml  { head :ok }