vitalif
/
phantomjs
mirror of https://github.com/vitalif/phantomjs
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'JamesMGreene/ExposeProcessId'

1.8
Ariya Hidayat 2012-11-08 06:24:32 -08:00
parent eadb03a978 280305797e
commit 7b84e43a10
3 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/system.cpp
View File

@ -2,6 +2,7 @@
This file is part of the PhantomJS project from Ofi Labs. This file is part of the PhantomJS project from Ofi Labs.
Copyright (C) 2012 execjosh, http://execjosh.blogspot.com Copyright (C) 2012 execjosh, http://execjosh.blogspot.com
Copyright (C) 2012 James M. Greene <james.m.greene@gmail.com>
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met: modification, are permitted provided that the following conditions are met:
@ -29,6 +30,7 @@
#include "system.h" #include "system.h"
#include <QApplication>
#include <QSslSocket> #include <QSslSocket>
#include <QSysInfo> #include <QSysInfo>
#include <QVariantMap> #include <QVariantMap>
@ -120,6 +122,11 @@ System::System(QObject *parent) :
#endif #endif
} }
qint64 System::pid() const
{
return QApplication::applicationPid();
}
void System::setArgs(const QStringList &args) void System::setArgs(const QStringList &args)
{ {
m_args = args; m_args = args;
@ -147,6 +154,7 @@ bool System::isSSLSupported() const
void System::initCompletions() void System::initCompletions()
{ {
addCompletion("pid");
addCompletion("args"); addCompletion("args");
addCompletion("env"); addCompletion("env");
addCompletion("platform"); addCompletion("platform");

4
src/system.h
View File

@ -2,6 +2,7 @@
This file is part of the PhantomJS project from Ofi Labs. This file is part of the PhantomJS project from Ofi Labs.
Copyright (C) 2012 execjosh, http://execjosh.blogspot.com Copyright (C) 2012 execjosh, http://execjosh.blogspot.com
Copyright (C) 2012 James M. Greene <james.m.greene@gmail.com>
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met: modification, are permitted provided that the following conditions are met:
@ -42,6 +43,7 @@
class System : public REPLCompletable class System : public REPLCompletable
{ {
Q_OBJECT Q_OBJECT
Q_PROPERTY(qint64 pid READ pid)
Q_PROPERTY(QStringList args READ args) Q_PROPERTY(QStringList args READ args)
Q_PROPERTY(QVariant env READ env) Q_PROPERTY(QVariant env READ env)
Q_PROPERTY(QVariant os READ os) Q_PROPERTY(QVariant os READ os)
@ -50,6 +52,8 @@ class System : public REPLCompletable
public: public:
explicit System(QObject *parent = 0); explicit System(QObject *parent = 0);
qint64 pid() const;
void setArgs(const QStringList& args); void setArgs(const QStringList& args);
QStringList args() const; QStringList args() const;

16
test/system-spec.js
View File

@ -6,6 +6,22 @@ describe("System object", function() {
expect(system).toNotEqual(null); expect(system).toNotEqual(null);
}); });
it("should have pid property", function() {
expect(system.hasOwnProperty('pid')).toBeTruthy();
});
it("should have pid as a number", function() {
expect(typeof system.pid).toEqual('number');
});
it("should have pid that is an integer", function() {
expect(system.pid).toMatch(/^\d+$/);
});
it("should have pid greater than 0", function() {
expect(system.pid).toBeGreaterThan(0);
});
it("should have platform as string", function() { it("should have platform as string", function() {
expect(typeof system.platform).toEqual('string'); expect(typeof system.platform).toEqual('string');
}); });