gooddata 0.6.16 → 0.6.17

data/spec/integration/full_project_spec.rb

@@ -40,7 +40,7 @@ describe "Full project implementation", :constraint => 'slow' do
     expect(results).to be_nil
 
     # When we change the model using the original blueprint. Basically change the title back.
-    results = GoodData::Model::ProjectCreator.migrate_datasets(@spec, project: @project, client: @client)
+    results = @project.update_from_blueprint(@spec)
     # It should offer no changes using the original blueprint
     results = GoodData::Model::ProjectCreator.migrate_datasets(@spec, project: @project, client: @client, dry_run: true)
     expect(results).to be_nil

data/spec/unit/core/connection_spec.rb

@@ -32,4 +32,20 @@ describe GoodData::Rest::Connection do
       c.disconnect
     end
   end
+
+  describe '#generate_request_id' do
+    it "Generates a non-empty string" do
+      c = ConnectionHelper.create_default_connection
+
+      # generate a request id, and pass it to a request
+      id = c.generate_request_id
+      resp = c.get('/gdc/md', :request_id => id)
+
+      id.should be_a(String)
+      id.should_not be_empty
+
+      c.disconnect
+    end
+  end
+
 end

data/spec/unit/core/logging_spec.rb

@@ -1,6 +1,30 @@
 # encoding: UTF-8
 
 require 'gooddata/core/logging'
+require 'logger'
+
+# Logger that remembers the last logged message
+class TestLogger < Logger
+  attr_reader :last_message
+  def debug(*args)
+    @last_message = args[0]
+    super(*args)
+  end
+  def info(*args)
+    @last_message = args[0]
+    super(*args)
+  end
+  def warn(*args)
+    @last_message = args[0]
+    super(*args)
+  end
+  def error(*args)
+    @last_message = args[0]
+    super(*args)
+  end
+end
+
+
 
 describe 'GoodData - logging' do
   TEST_MESSAGE = 'Hello World!'
@@ -17,21 +41,45 @@ describe 'GoodData - logging' do
     GoodData.logger.warn TEST_MESSAGE
   end
 
+  def test_request_id_logging
+    c = ConnectionHelper.create_default_connection
+    id = c.generate_request_id
+    GoodData.logger.info "Request id: #{id} Doing something very useful"
+    c.get('/gdc/md', :request_id => id)
+    id
+  end
+
   def test_all
     test_error
     test_info
-    test_info
+    test_warn
+    test_request_id_logging
   end
 
   before(:each) do
-    @is_logging_on = GoodData.logging_on?
-
-    # TODO: Use some kind of 'reset' instead
-    GoodData.logging_on if !@is_logging_on
+    # remember the state of logging before
+    @logging_on_at_start = GoodData.logging_on?
   end
 
   after(:each) do
-    GoodData.logging_off if !@is_logging_on
+    # restore the logging state
+    if @logging_on_at_start
+      GoodData.logging_on
+    else
+      GoodData.logging_off
+    end
+  end
+
+  describe '#logger' do
+    it "can assign a custom logger" do
+      GoodData.logger = TestLogger.new(STDOUT)
+      test_all
+    end
+    it 'has the request id logged when I passed it' do
+      GoodData.logger = TestLogger.new(STDOUT)
+      id = test_request_id_logging
+      expect(GoodData.logger.last_message).to include(id)
+    end
   end
 
 

data/spec/unit/models/domain_spec.rb

@@ -125,12 +125,18 @@ describe GoodData::Domain do
         .reject { |u| u.login == ConnectionHelper::DEFAULT_USERNAME }.sample
 
       old_email = user.email
+      old_sso_provider = user.sso_provider || ''
       user.email = 'john.doe@gooddata.com'
+      user.sso_provider = user.sso_provider ? user.sso_provider.reverse : 'some_sso_provider'
       @domain.update_user(user)
-      expect(@domain.get_user(user.login).email).to eq 'john.doe@gooddata.com'
-      user.email = old_email
-      @domain.update_user(user)
-      expect(@domain.get_user(user.login).email).to eq old_email
+      updated_user = @domain.find_user_by_login(user.login)
+      expect(updated_user.email).to eq 'john.doe@gooddata.com'
+      expect(updated_user.sso_provider).to eq 'some_sso_provider'
+      updated_user.email = old_email
+      updated_user.sso_provider = old_sso_provider
+      @domain.update_user(updated_user)
+      expect(@domain.find_user_by_login(user.login).email).to eq old_email
+      expect(@domain.find_user_by_login(user.login).sso_provider).to eq old_sso_provider
     end
   end
 end

data/spec/unit/models/execution_spec.rb

@@ -0,0 +1,102 @@
+require 'gooddata/models/schedule'
+
+describe GoodData::Execution do
+
+  before(:each) do
+    @data = {"execution"=>
+      {"startTime"=>"2015-02-27T15:44:21.759Z",
+       "endTime"=>"2015-02-27T15:47:49.383Z",
+       "log"=>
+        "/gdc/projects/tk3b994vmdpcb0xjwexc9moen8t5bpiw/dataload/processes/2b031451-b1a2-4039-8e36-0672542a0e60/executions/54f090d5e4b0c9cbdcb0f45b/log",
+       "status"=>"OK",
+       "trigger"=>"MANUAL",
+       "links"=>
+        {"self"=>
+          "/gdc/projects/tk3b994vmdpcb0xjwexc9moen8t5bpiw/schedules/54f08d1de4b0c9cbdcb0f323/executions/54f090d5e4b0c9cbdcb0f45b"},
+       "createdTime"=>"2015-02-27T15:44:21.361Z"}}
+    @execution = GoodData::Execution.new(@data)
+  end
+
+  describe '#created' do
+    it 'returns created as a Time instance' do
+      expect(@execution.created.class).to eq Time
+      expect(@execution.created.to_s).to eq '2015-02-27 15:44:21 UTC'
+    end
+  end
+
+  describe '#error?' do
+    it 'returns true if executione errored out' do
+      expect(@execution.error?).to be_falsy
+    end
+  end
+
+  describe '#ok?' do
+    it 'returns true if executione finished ok' do
+      expect(@execution.ok?).to be_truthy
+    end
+  end
+
+  describe '#finished' do
+    it 'returns time when execution finished' do
+      expect(@execution.finished.class).to eq Time
+      expect(@execution.finished.to_s).to eq '2015-02-27 15:47:49 UTC'
+    end
+
+    it 'returns nil if it is not finished' do
+      @data['execution']['status'] = 'RUNNING'
+      @data['execution']['endTime'] = nil
+      running_execution = GoodData::Execution.new(@data)
+      expect(running_execution.finished).to be_nil
+    end
+  end
+
+  describe '#schedule_uri' do
+    it 'returns uri of schedule that was executed' do
+      expect(@execution.schedule_uri).to eq '/gdc/projects/tk3b994vmdpcb0xjwexc9moen8t5bpiw/schedules/54f08d1de4b0c9cbdcb0f323'
+    end
+  end
+
+  describe '#running?' do
+    it 'returns false if executione is already finished' do
+      expect(@execution.running?).to be_falsy
+    end
+
+    it 'returns true if executione is currently finished' do
+      @data['execution']['status'] = 'RUNNING'
+      running_execution = GoodData::Execution.new(@data)
+      expect(running_execution.running?).to be_truthy
+    end
+  end
+
+  describe '#started' do
+    it 'returns time when execution started' do
+      expect(@execution.started.class).to eq Time
+      expect(@execution.started.to_s).to eq '2015-02-27 15:44:21 UTC'
+    end
+  end
+
+  describe '#status' do
+    it 'returns :ok for finished execution' do
+      expect(@execution.status).to eq :ok
+    end
+  end
+
+  describe '#uri' do
+    it 'returns time when execution started' do
+      expect(@execution.uri).to eq '/gdc/projects/tk3b994vmdpcb0xjwexc9moen8t5bpiw/schedules/54f08d1de4b0c9cbdcb0f323/executions/54f090d5e4b0c9cbdcb0f45b'
+    end
+  end
+
+  describe '#duration' do
+    it 'returns time it took to run execution' do
+      expect(@execution.duration).to eq 207.624
+    end
+
+    it 'returns nil if it is not finished' do
+      @data['execution']['status'] = 'RUNNING'
+      @data['execution']['endTime'] = nil
+      running_execution = GoodData::Execution.new(@data)
+      expect(running_execution.duration.class).to eq Float
+    end
+  end
+end

data/spec/unit/models/from_wire_spec.rb

@@ -42,11 +42,11 @@ describe GoodData::Model::FromWire do
   end
 
   it "should enable sorting" do
-    pending("UAAA")
+    skip("UAAA")
   end
 
   it "should allow defining date dimensions" do
-    pending('UAAA')
+    skip('UAAA')
   end
 
   it "should generate the same thing it parsed" do
@@ -61,6 +61,7 @@ describe GoodData::Model::FromWire do
       {
         type: 'anchor',
         name: "techoppanalysis",
+        folder: "Opportunity Benchmark",
         title: "Tech Opp. Analysis",
         gd_data_type: "VARCHAR(128)",
         gd_type: "GDC.text",
@@ -73,6 +74,7 @@ describe GoodData::Model::FromWire do
     expect(x).to eq [
       {
         :type=>'attribute',
+        :folder => "Opportunity Benchmark",
         :name=>"month",
         :gd_data_type=>"VARCHAR(128)",
         :gd_type=>"GDC.text",
@@ -88,6 +90,7 @@ describe GoodData::Model::FromWire do
       },
      {
        :type=>'attribute',
+       :folder => "Opportunity Benchmark",
        :name=>"cohorttype",
        :title=>"Cohort Type",
        :gd_data_type=>"VARCHAR(128)",
@@ -117,6 +120,12 @@ describe GoodData::Model::FromWire do
       }]
   end
 
+  it "should be able to parse description from both attributes and facts" do
+    expect(@blueprint.find_dataset('opportunity').anchor[:description]).to eq 'This is opportunity attribute description'
+    expect(@blueprint.find_dataset('stage_history').facts.find {|f| f[:name] == 'stage_velocity'}[:description]).to eq 'Velocity description'
+    expect(@blueprint.find_dataset('opp_owner').attributes.find {|f| f[:name] == 'region'}[:description]).to eq 'Owner Region description'
+  end
+
   it "should be able to deal with fiscal dimensions with weird names" do
     model_view = MultiJson.load(File.read('./spec/data/wire_models/nu_model.json'))
     blueprint = FromWire.from_wire(model_view)

data/spec/unit/models/model_spec.rb

@@ -16,7 +16,7 @@ describe GoodData::Model do
                 {
                     :name => "commits",
                     :columns => [
-                        {:type => "fact", :name => "lines_changed"}
+                        {:type => "fact", :name => "lines_changed", :description=>"Fact description"}
                     ]
                 }
             ]})
@@ -49,7 +49,7 @@ describe GoodData::Model do
     stuff = GoodData::Model.merge_dataset_columns(first_dataset, additional_blueprint)
 
     stuff[:columns].count.should == 4
-    stuff[:columns].include?({:type => "fact", :name => "lines_changed"}).should == true
+    stuff[:columns].include?({:type => "fact", :name => "lines_changed", :description=>"Fact description"}).should == true
     stuff[:columns].group_by { |col| col[:name] }["lines_changed"].count.should == 1
   end
 

data/spec/unit/models/project_blueprint_spec.rb

@@ -174,7 +174,7 @@ describe GoodData::Model::ProjectBlueprint do
     end
     dataset = builder.to_blueprint
     @blueprint.datasets.count.should == 3
-    @blueprint.add_dataset(dataset)
+    @blueprint.add_dataset!(dataset)
     @blueprint.datasets.count.should == 4
   end
 

data/spec/unit/models/schedule_spec.rb

@@ -4,8 +4,6 @@ describe GoodData::Schedule do
   SCHEDULE_ID = ScheduleHelper::SCHEDULE_ID
   SCHEDULE_URL = "/gdc/projects/#{ProjectHelper::PROJECT_ID}/schedules/#{SCHEDULE_ID}"
 
-  @test_cron = '0 15 27 7 *'
-
   before(:all) do
     @client = ConnectionHelper.create_default_connection
 
@@ -20,11 +18,16 @@ describe GoodData::Schedule do
 
     @project = ProjectHelper.get_default_project(:client => @client)
     @project_executable = 'graph/graph.grf'
+    @test_cron = '0 15 27 7 *'
     @test_data = {
       :timezone => 'UTC',
       :cron => '2 2 2 2 *',
       :client => @client,
-      :project => @project
+      :project => @project,
+      :params => {
+        'a' => 'b',
+        'b' => 'c'
+      }
     }
 
     @test_data_with_optional_param = {
@@ -76,12 +79,8 @@ describe GoodData::Schedule do
 
   describe '#create' do
     it 'Creates new schedule if mandatory params passed' do
-      schedule = nil
       begin
-        expect {
-          schedule = @project.create_schedule(ProcessHelper::PROCESS_ID, @test_cron, @project_executable, @test_data)
-        }.not_to raise_error
-
+        schedule = @project.create_schedule(ProcessHelper::PROCESS_ID, @test_cron, @project_executable, @test_data)
         expect(schedule).to be_truthy
       ensure
         schedule && schedule.delete
@@ -89,12 +88,8 @@ describe GoodData::Schedule do
     end
 
     it 'Creates new schedule if mandatory params passed and optional params are present' do
-      schedule = nil
       begin
-        expect {
-          schedule = @project.create_schedule(ProcessHelper::PROCESS_ID, @test_cron, @project_executable, @test_data_with_optional_param)
-        }.not_to raise_error
-
+        schedule = @project.create_schedule(ProcessHelper::PROCESS_ID, @test_cron, @project_executable, @test_data_with_optional_param)
         expect(schedule).to be_truthy
       ensure
         schedule && schedule.delete
@@ -138,25 +133,26 @@ describe GoodData::Schedule do
 
     it 'Throws exception when no timezone specified' do
       data = @test_data.deep_dup
-      data[:timezone] = nil
-      schedule = nil
+      schedule = @project.create_schedule(ProcessHelper::PROCESS_ID, @test_cron, @project_executable, data)
+      schedule.timezone = nil
       begin
         expect {
-          schedule = @project.create_schedule(ProcessHelper::PROCESS_ID, @test_cron, @project_executable, data)
+          schedule.save
         }.to raise_error 'A timezone has to be provided'
       ensure
         schedule && schedule.delete
       end
     end
 
-    it 'Throws exception when no timezone specified' do
-      data = @test_data.deep_dup
-      data[:type] = nil
+    it 'Throws exception when no schedule type is specified' do
       schedule = nil
+      data = @test_data.deep_dup
       begin
-      expect {
         schedule = @project.create_schedule(ProcessHelper::PROCESS_ID, @test_cron, @project_executable, data)
-      }.to raise_error 'Schedule type has to be provided'
+        schedule.type = nil
+        expect {
+          schedule.save
+        }.to raise_error 'Schedule type has to be provided'
       ensure
         schedule && schedule.delete
       end
@@ -165,13 +161,13 @@ describe GoodData::Schedule do
 
   describe '#cron' do
     it 'Should return cron as string' do
-      schedule = nil
       begin
         schedule = @project.create_schedule(ProcessHelper::PROCESS_ID, @test_cron, @project_executable, @test_data)
         res = schedule.cron
         res.should_not be_nil
         res.should_not be_empty
         res.should be_a_kind_of(String)
+        expect(schedule.time_based?).to be_truthy
       ensure
         schedule && schedule.delete
       end
@@ -334,12 +330,14 @@ describe GoodData::Schedule do
         old_params = schedule.params
 
         test_params = {
-          'PROCESS_ID' => '1-2-3-4'
+          'some_new_param' => '1-2-3-4'
         }
 
         schedule.params = test_params
-        expect(schedule.params).to eq(old_params.merge(test_params))
+        expect(schedule.params.keys).to eq(%w(PROCESS_ID EXECUTABLE some_new_param))
+        expect(schedule.params['some_new_param']).to eq '1-2-3-4'
         expect(schedule.dirty).to eq(true)
+        schedule.save
       ensure
         schedule && schedule.delete
       end
@@ -486,4 +484,16 @@ describe GoodData::Schedule do
       end
     end
   end
+
+  describe '#executions' do
+    it 'Returns executions' do
+      begin
+        schedule = @project.create_schedule(ProcessHelper::PROCESS_ID, @test_cron, @project_executable, @test_data_with_optional_param)
+        expect(schedule.executions).to be_empty
+        schedule.execute
+      ensure
+        schedule && schedule.delete
+      end
+    end
+  end
 end